dd4e67b82f32b79cf971e236070cb40f8ab05ec8 kent Sat Jan 8 21:05:40 2011 -0800 Starting to get trackHub stuff to work with composite tracks. (Using UNC Faire as a test set on hg19.) diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 38ed38f..a4a4f96 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2739,30 +2739,31 @@ int hubId = hubIdFromTrackName(track); struct sqlConnection *conn = hConnectCentral(); struct hubConnectStatus *hubStatus = hubConnectStatusForId(conn, hubId); hDisconnectCentral(&conn); if (hubStatus == NULL) errAbort("The hubId %d was not found", hubId); if (!isEmpty(hubStatus->errorMessage)) errAbort("Hub %s at %s has the error: %s", hubStatus->shortLabel, hubStatus->hubUrl, hubStatus->errorMessage); char hubName[16]; safef(hubName, sizeof(hubName), "%d", hubId); struct trackHub *hub = trackHubOpen(hubStatus->hubUrl, hubName); struct trackHubGenome *hubGenome = trackHubFindGenome(hub, database); struct trackDb *tdbList = trackHubTracksForGenome(hub, hubGenome); tdbList = trackDbLinkUpGenerations(tdbList); + tdbList = trackDbPolishAfterLinkup(tdbList, database); rAddTrackListToHash(trackHash, tdbList, chromosome, FALSE); tdb = hashFindVal(trackHash, track); if (tdb == NULL) errAbort("Can't find track %s in %s", track, hubStatus->hubUrl); } else if (sameString(track, "hgPcrResult")) tdb = pcrResultFakeTdb(); else { tdb = tdbForTrack(database, track,&tdbList); } if (tdb == NULL) { uglyAbort("Can't find %s in track database %s chromosome %s. TrackHash has %d els", track, database, chromosome, trackHash->elCount);