32fd550dc69060f46046d3f360e6ace010945a99 braney Fri May 25 13:05:56 2018 -0700 expand barChartSampleUrl and barChartMatrixUrl urls so they can be relative paths diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index 74d50d9..a6a6747 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -738,30 +738,32 @@ char *oldVal = hel->val; hel->val = trackHubRelativeUrl(hubUrl, oldVal); freeMem(oldVal); } } static void expandBigDataUrl(struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb) /* Expand bigDataUrls so that no longer relative to genome->trackDbFile */ { expandOneUrl(tdb->settingsHash, genome->trackDbFile, "bigDataUrl"); expandOneUrl(tdb->settingsHash, genome->trackDbFile, "frames"); expandOneUrl(tdb->settingsHash, genome->trackDbFile, "summary"); expandOneUrl(tdb->settingsHash, genome->trackDbFile, "linkDataUrl"); expandOneUrl(tdb->settingsHash, genome->trackDbFile, "searchTrix"); +expandOneUrl(tdb->settingsHash, genome->trackDbFile, "barChartSampleUrl"); +expandOneUrl(tdb->settingsHash, genome->trackDbFile, "barChartMatrixUrl"); } struct trackHubGenome *trackHubFindGenome(struct trackHub *hub, char *genomeName) /* Return trackHubGenome of given name associated with hub. Return NULL if no * such genome. */ { return hashFindVal(hub->genomeHash, genomeName); } static void requireBarChartBars(struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb) /* Fetch setting(s) or give an error message */ { /* LATER: allow URL for file containing labels and colors */ requiredSetting(hub, genome, tdb, BAR_CHART_CATEGORY_LABELS); }