d53e5750a3d3e8b7da4d38d6242022bdece345e2 braney Tue Jan 24 13:00:31 2017 -0800 changes to tagStorm support. #18183 diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index 848f409..0f29433 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -855,42 +855,42 @@ // clear these two pointers which we set in markContainers tdb->subtracks = NULL; tdb->parent = NULL; } } struct trackDb *trackHubTracksForGenome(struct trackHub *hub, struct trackHubGenome *genome) /* Get list of tracks associated with genome. Check that it only is composed of legal * types. Do a few other quick checks to catch errors early. */ { struct lineFile *lf = udcWrapShortLineFile(genome->trackDbFile, NULL, 64*1024*1024); struct trackDb *tdbList = trackDbFromOpenRa(lf, NULL); lineFileClose(&lf); -char *tagStormName = hashFindVal(genome->settingsHash, "tagStorm"); +char *tagStormName = hashFindVal(genome->settingsHash, "metaDb"); char *absStormName = NULL; if (tagStormName) absStormName = trackHubRelativeUrl(hub->url, tagStormName); /* Make bigDataUrls more absolute rather than relative to genome.ra dir */ struct trackDb *tdb; for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { expandBigDataUrl(hub, genome, tdb); if (absStormName) - hashReplace(tdb->settingsHash, "tagStorm", absStormName); + hashReplace(tdb->settingsHash, "metaDb", absStormName); } validateTracks(hub, genome, tdbList); trackDbAddTableField(tdbList); if (!isEmpty(hub->name)) trackHubAddNamePrefix(hub->name, tdbList); if (genome->twoBitPath == NULL) trackHubAddGroupName(hub->name, tdbList); for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { trackDbFieldsFromSettings(tdb); trackDbPolish(tdb); } return tdbList;