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/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 161f5e7..00349a9 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3296,37 +3296,36 @@ static void addTracksFromTrackHub(int id, char *hubUrl, struct track **pTrackList, struct trackHub **pHubList) /* Load up stuff from data hub and append to list. The hubUrl points to * a trackDb.ra format file. */ { /* Load trackDb.ra file and make it into proper trackDb tree */ char hubName[8]; safef(hubName, sizeof(hubName), "%d",id); struct trackHub *hub = trackHubOpen(hubUrl, hubName); if (hub != NULL) { struct trackHubGenome *hubGenome = trackHubFindGenome(hub, database); if (hubGenome != NULL) { struct trackDb *tdbList = trackHubTracksForGenome(hub, hubGenome); - trackDbLinkUpGenerations(tdbList); + tdbList = trackDbPolishAfterLinkup(tdbList, database); addTdbListToTrackList(tdbList, NULL, pTrackList); if (tdbList != NULL) slAddHead(pHubList, hub); } - } } void loadTrackHubs(struct track **pTrackList, struct trackHub **pHubList) /* Load up stuff from data hubs and append to lists. */ { struct hubConnectStatus *hub, *hubList = hubConnectStatusFromCart(cart); for (hub = hubList; hub != NULL; hub = hub->next) { addTracksFromTrackHub(hub->id, hub->hubUrl, pTrackList, pHubList); } hubConnectStatusFreeList(&hubList); } boolean restrictionEnzymesOk()