06620d160679a0d2e77dedbe35b35edeea08c517 chmalee Mon Jun 3 16:17:48 2019 -0700 Add checks to hubCheck and hgTrackUi for incorrect tag=val pairs in a subgroup line, refs #13428 diff --git src/hg/lib/hubConnect.c src/hg/lib/hubConnect.c index 5bdd180..08a8f09 100644 --- src/hg/lib/hubConnect.c +++ src/hg/lib/hubConnect.c @@ -360,31 +360,32 @@ } struct trackDb *hubConnectAddHubForTrackAndFindTdb( char *database, char *trackName, struct trackDb **pTdbList, struct hash *trackHash) /* Go find hub for trackName (which will begin with hub_), and load the tracks * for it, appending to end of list and adding to trackHash. Return the * trackDb associated with trackName. This will also fill in the html fields, * but just for that track and it's parents. */ { unsigned hubId = hubIdFromTrackName(trackName); struct hubConnectStatus *hub = hubFromId(hubId); struct trackHubGenome *hubGenome = trackHubFindGenome(hub->trackHub, database); struct trackDb *tdbList = trackHubTracksForGenome(hub->trackHub, hubGenome); tdbList = trackDbLinkUpGenerations(tdbList); tdbList = trackDbPolishAfterLinkup(tdbList, database); -trackDbPrioritizeContainerItems(tdbList); +//this next line causes warns to print outside of warn box on hgTrackUi +//trackDbPrioritizeContainerItems(tdbList); trackHubPolishTrackNames(hub->trackHub, tdbList); char *fixTrackName = cloneString(trackName); trackHubFixName(fixTrackName); rAddTrackListToHash(trackHash, tdbList, NULL, FALSE); if (pTdbList != NULL) *pTdbList = slCat(*pTdbList, tdbList); struct trackDb *tdb = hashFindVal(trackHash, fixTrackName); if (tdb == NULL) // superTracks aren't in the hash... look in tdbList tdb = findSuperTrack(tdbList, fixTrackName); if (tdb == NULL) errAbort("Can't find track %s in %s", fixTrackName, hub->trackHub->url); /* Add html for track and parents. */