src/hg/hgGenome/import.c 1.20

Index: src/hg/hgGenome/import.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgGenome/import.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -B -U 4 -r1.19 -r1.20
--- src/hg/hgGenome/import.c	11 May 2010 01:43:24 -0000	1.19
+++ src/hg/hgGenome/import.c	14 May 2010 23:30:24 -0000	1.20
@@ -252,13 +252,8 @@
 struct trackDb *track = NULL;
 
 if (name != NULL)
     {
-    /* getFullTrackList tweaks tdb->table mrna to all_mrna, so in
-     * case mrna is passed in (e.g. from hgc link to schema page)
-     * tweak it here too: */
-    if (sameString(name, "mrna"))
-        name = "all_mrna";
     track = findTrackInGroup(name, trackList, group);
     }
 if (track == NULL)
     {
@@ -280,22 +275,11 @@
 
 struct trackDb *getFullTrackList()
 /* Get all tracks including custom tracks if any. */
 {
-struct trackDb *list = hTrackDb(database, NULL), *tdb, *next;
+struct trackDb *list = hTrackDb(database, NULL);
 struct customTrack *ctList, *ct;
 
-
-for (tdb = list; tdb != NULL; tdb = next)
-    {
-    next = tdb->next;
-    /* Change the mrna track to all_mrna to avoid confusion elsewhere. */
-    if (sameString(tdb->table, "mrna"))
-        {
-        tdb->table = cloneString("all_mrna");
-        }
-    }
-
 /* Create dummy group for custom tracks if any */
 ctList = getCustomTracks();
 for (ct = ctList; ct != NULL; ct = ct->next)
     {
@@ -397,9 +381,9 @@
     slNameSort(&nameList);
     }
 
 name = slNameNew(trackTable);
-if (!tdbIsComposite(track))
+if (!tdbIsComposite(track) && !trackDbLocalSetting(track, "container"))
     /* suppress for composite tracks -- only the subtracks have tables */
     slAddHead(&nameList, name);
 
 addTablesAccordingToTrackType(&nameList, uniqHash, track);