41d6ade369a45eec328b82f119e44bfddd6d350b
chmalee
Tue Oct 4 10:45:17 2022 -0700
Fix urlLabel bug for barChart tracks I introduced when adding variable substitution to urlLabel setting, refs #29954
diff --git src/hg/hgc/barChartClick.c src/hg/hgc/barChartClick.c
index c6b809c..ca51ddc 100644
--- src/hg/hgc/barChartClick.c
+++ src/hg/hgc/barChartClick.c
@@ -566,31 +566,31 @@
genericHeader(tdb, item);
// get name and name2 from trackDb, .as file, or use defaults
struct asColumn *nameCol = NULL, *name2Col = NULL;
//struct asColumn *name2Col;
char *nameLabel = NULL, *name2Label = NULL;
if (as != NULL)
{
numColumns = slCount(as->columnList);
nameCol = asFindColByIx(as, BARCHART_NAME_COLUMN_IX);
name2Col = asFindColByIx(as, BARCHART_NAME2_COLUMN_IX);
}
nameLabel = trackDbSettingClosestToHomeOrDefault(tdb, "bedNameLabel", nameCol ? nameCol->comment : "Item");
struct slPair *fields = getFields(tdb, row);
if (trackDbSettingClosestToHomeOrDefault(tdb, "url", NULL) != NULL)
- printCustomUrlWithFields(tdb, item, nameLabel, TRUE, fields);
+ printCustomUrlWithFields(tdb, item, item, TRUE, fields);
else
printf("%s: %s ", nameLabel, chartItem->name);
name2Label = name2Col ? name2Col->comment : "Alternative name";
if (differentString(chartItem->name2, ""))
{
if (trackDbSettingClosestToHomeOrDefault(tdb, "url2", NULL) != NULL)
printOtherCustomUrl(tdb, chartItem->name2, "url2", TRUE);
else
printf("(%s: %s)
\n", name2Label, chartItem->name2);
}
else
printf("
\n");
int categId;
float highLevel = barChartMaxValue(chartItem, &categId);