src/hg/hgTracks/config.c 1.92

1.92 2010/05/11 01:43:27 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields. 
Index: src/hg/hgTracks/config.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/config.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -b -B -U 4 -r1.91 -r1.92
--- src/hg/hgTracks/config.c	27 Mar 2010 04:27:00 -0000	1.91
+++ src/hg/hgTracks/config.c	11 May 2010 01:43:27 -0000	1.92
@@ -209,9 +209,9 @@
                 struct trackRef *tr2;
                 for (tr2 = group->trackList; tr2 != NULL; tr2 = tr2->next)
                     {
                     char *parent = tr2->track->tdb->parentName;
-                    if (parent && sameString(parent, track->mapName))
+                    if (parent && sameString(parent, track->track))
                         {
                         AllocVar(ref);
                         ref->track = tr2->track;
                         slAddTail(&refList, ref);
@@ -240,9 +240,9 @@
 	    hPrintf("<A %s%s%s HREF=\"%s?%s=%u&g=%s&hgTracksConfigPage=configure\">",
                 tdb->parent ? "TITLE=\"Part of super track: " : "",
                 tdb->parent ? tdb->parent->shortLabel : "",
                 tdb->parent ? "...\"" : "", hgTrackUiName(),
-		cartSessionVarName(), cartSessionId(cart), track->mapName);
+		cartSessionVarName(), cartSessionId(cart), track->track);
         hPrintf(" %s", track->shortLabel);
         if (tdbIsSuper(track->tdb))
             hPrintf("...");
 	if (track->hasUi)
@@ -264,9 +264,9 @@
                 }
             else
                 {
                 /* check for option of limiting visibility to one mode */
-                hTvDropDownClassVisOnly(track->mapName, track->visibility,
+                hTvDropDownClassVisOnly(track->track, track->visibility,
                             track->canPack, (track->visibility == tvHide) ?
                             "hiddenText" : "normalText",
                             trackDbSetting(track->tdb, "onlyVisibility"));
                 }
@@ -280,18 +280,18 @@
 #ifndef IMAGEv2_DRAG_REORDER
         if (withPriorityOverride)
             {
             hPrintf("<TD>");
-            safef(pname, sizeof(pname), "%s.priority",track->mapName);
+            safef(pname, sizeof(pname), "%s.priority",track->track);
             hDoubleVar(pname, (double)track->priority, 4);
             hPrintf("</TD>");
             hPrintf("<TD>\n");
             /* suppress group pull-down for supertrack members */
             if (tdbIsSuperTrackChild(track->tdb))
                 hPrintf("&nbsp");
             else
                 {
-                safef(gname, sizeof(gname), "%s.group",track->mapName);
+                safef(gname, sizeof(gname), "%s.group",track->track);
                 printGroupListHtml(gname, groupList, track->groupName);
                 }
             hPrintf("</TD>");
             }