src/hg/lib/hui.c 1.258

1.258 2010/02/06 21:43:01 kent
Changing 'subTrack' to 'parent' internally. A backwards compatability routine will make it so either tag can be used in a trackDb file.

Index: src/hg/lib/hui.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hui.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -b -B -U 4 -r1.257 -r1.258
--- src/hg/lib/hui.c	5 Feb 2010 20:08:42 -0000	1.257
+++ src/hg/lib/hui.c	6 Feb 2010 21:43:01 -0000	1.258
@@ -3210,9 +3210,9 @@
     boolean enabledCB = TRUE;
     boolean isPrimary = FALSE;
     char *setting;
     int ix;
-    if ((setting = trackDbLocalSetting(subtrack, "subTrack")) != NULL)
+    if ((setting = trackDbLocalSetting(subtrack, "parent")) != NULL)
         {
         if (chopLine(cloneString(setting), words) >= 2)
             checkedCB = differentString(words[1], "off");
         }
@@ -5663,14 +5663,14 @@
 char *stView   = NULL;
 char *name     = NULL;
 char *rootName = NULL;
 // This routine should give these results: compositeName.viewName or else subtrackName.viewName or else compositeName or else subtrackName
-if(tdbIsCompositeChild(tdb) == TRUE && trackDbLocalSetting(tdb, "subTrack") != NULL)
+if(tdbIsCompositeChild(tdb) == TRUE && trackDbLocalSetting(tdb, "parent") != NULL)
     {
     if(trackDbSettingClosestToHomeOn(tdb, "configurable"))
         rootName = tdb->tableName;  // subtrackName
     else
-        rootName = firstWordInLine(cloneString(trackDbLocalSetting(tdb, "subTrack"))); // compositeName
+        rootName = firstWordInLine(cloneString(trackDbLocalSetting(tdb, "parent"))); // compositeName
     }
 if(rootName != NULL)
     {
     if(subgroupFind(tdb,"view",&stView))