16ac161a7e0835ba943b8c33c21858b0d1938219 braney Thu Oct 6 15:02:49 2011 -0700 change the relationship between the trackHub structure and the hubConnectStatus structure to be hierarchical. This fixes #4920. We now *always* fetch the URL contents instead of trusting what's in the hubStatus table *unless* there's an error message in the hubStatus table. diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c index 168bc04..5838b76 100644 --- src/hg/hgTables/hgTables.c +++ src/hg/hgTables/hgTables.c @@ -219,31 +219,31 @@ { *pDb = buf; *s++ = 0; *pTable = s; } } struct grp *grpFromHub(struct hubConnectStatus *hub) /* Make up a grp structur from hub */ { struct grp *grp; AllocVar(grp); char name[16]; safef(name, sizeof(name), "hub_%d", hub->id); grp->name = cloneString(name); -grp->label = cloneString(hub->shortLabel); +grp->label = cloneString(hub->trackHub->shortLabel); return grp; } static struct trackDb *getFullTrackList(struct hubConnectStatus *hubList, struct grp **pHubGroups) /* Get all tracks including custom tracks if any. */ { struct trackDb *list = hTrackDb(database); struct customTrack *ctList, *ct; /* exclude any track with a 'tableBrowser off' setting */ struct trackDb *tdb, *nextTdb, *newList = NULL; for (tdb = list; tdb != NULL; tdb = nextTdb) { nextTdb = tdb->next; if (tdbIsDownloadsOnly(tdb) || tdb->table == NULL)