09208616b0f709b570f16ac1ed337a7b0c4353ef braney Sun Nov 1 15:33:40 2015 -0800 add bigChain support in hgTracks (no redmine) diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index 1f428ab..e26498b 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -689,30 +689,31 @@ if (hel != NULL) { 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"); } 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 validateOneTrack( struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb) /* Validate a track's trackDb entry. */ { /* Check for existence of fields required in all tracks */ @@ -743,30 +744,31 @@ } } else { /* Check type field. */ char *type = requiredSetting(hub, genome, tdb, "type"); if (!(startsWithWord("bigWig", type) || startsWithWord("bigBed", type) || #ifdef USE_HAL startsWithWord("halSnake", type) || #endif startsWithWord("vcfTabix", type) || startsWithWord("bigPsl", type) || startsWithWord("bigMaf", type) || startsWithWord("bigGenePred", type) || + startsWithWord("bigChain", type) || startsWithWord("bam", type))) { errAbort("Unsupported type '%s' in hub %s genome %s track %s", type, hub->url, genome->name, tdb->track); } requiredSetting(hub, genome, tdb, "bigDataUrl"); } } static void markContainers( struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdbList) /* Mark containers that are parents, or have them. */ { struct hash *hash = hashNew(0);