ec5633a2cff4b43137e7940ead29493eed8828de
kent
  Thu Jan 13 20:48:05 2011 -0800
Fixing hgTracks so that hub is in it's own group again.  Broke this with some efforts to get things going in hgTables.
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index d4cf78e..75032a6 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -108,44 +108,46 @@
 
 /* Structure returned from findGenomePos.
  * We use this to to expand any tracks to full
  * that were found to contain the searched-upon
  * position string */
 struct hgPositions *hgp = NULL;
 
 /* Other global variables. */
 struct trackHub *hubList = NULL;	/* List of all relevant hubs. */
 struct group *groupList = NULL;    /* List of all tracks. */
 char *browserName;              /* Test or public browser */
 char *organization;             /* UCSC */
 
 struct hash *trackHash = NULL; /* Hash of the tracks by their name. */
 
+#ifdef DEBUG
 void uglySnoopTrackList(int depth, struct track *trackList)
 /* Print out some info on track list. */
 {
 struct track *track;
 for (track = trackList; track != NULL; track = track->next)
     {
     if (stringIn("FaireH1h", track->track))
 	{
 	repeatCharOut(uglyOut, '+', depth);
         uglyf("%s pri=%g defPri=%g<BR>\n", track->track, track->priority, track->defaultPriority);
 	}
     uglySnoopTrackList(depth+1, track->subtracks);
     }
 }
+#endif /* DEBUG */
 
 struct track *trackFindByName(struct track *tracks, char *trackName)
 /* find a track in tracks by name, recursively searching subtracks */
 {
 struct track *track;
 for (track = tracks; track != NULL; track = track->next)
     {
     if (sameString(track->track, trackName))
         return track;
     else if (track->subtracks != NULL)
         {
         struct track *st = trackFindByName(track->subtracks, trackName);
         if (st != NULL)
             return st;
         }
@@ -3302,31 +3304,31 @@
 for (ct = ctList; ct != NULL; ct = ct->next)
     {
     hasCustomTracks = TRUE;
     tg = newCustomTrack(ct);
     slAddHead(pTrackList, tg);
     }
 }
 
 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);
+safef(hubName, sizeof(hubName), "hub_%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);
 	tdbList = trackDbLinkUpGenerations(tdbList);
 	tdbList = trackDbPolishAfterLinkup(tdbList, database);
 	trackDbPrioritizeContainerItems(tdbList);
 	addTdbListToTrackList(tdbList, NULL, pTrackList);
 	if (tdbList != NULL)
 	    slAddHead(pHubList, hub);
 	}
     }