src/hg/lib/trackDbCustom.c 1.78

1.78 2010/02/06 21:43:02 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/trackDbCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/trackDbCustom.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -b -B -U 4 -r1.77 -r1.78
--- src/hg/lib/trackDbCustom.c	5 Feb 2010 01:09:43 -0000	1.77
+++ src/hg/lib/trackDbCustom.c	6 Feb 2010 21:43:02 -0000	1.78
@@ -902,12 +902,9 @@
 /* Do subtrack hierarchy - filling in parent and subtracks fields. */
 for (tdb = superlessList; tdb != NULL; tdb = next)
     {
     next = tdb->next;
-#ifdef SOON
     char *subtrackSetting = trackDbLocalSetting(tdb, "parent");
-#endif /* SOON */
-    char *subtrackSetting = trackDbLocalSetting(tdb, "subTrack");
     if (subtrackSetting != NULL)
         {
 	char *parentName = cloneFirstWord(subtrackSetting);
 	struct trackDb *parent = hashFindVal(trackHash, parentName);
@@ -1050,17 +1047,19 @@
 char *tag = *pTag;
 char *val = *pVal;
 boolean updated = FALSE;
 
-#ifdef SOON
 if (sameString(tag, "subTrack"))
     {
     tag = "parent";
+    updated = TRUE;
     }
+#ifdef SOON
 else if (sameString(tag, "compositeTrack"))
     {
     tag = "container";
     val = "composite";
+    updated = TRUE;
     }
 else if (sameString(tag, "superTrack"))
     {
     if (sameWord(val, "on"))
@@ -1071,8 +1070,9 @@
     else
         {
 	tag = "parent";
 	}
+    updated = TRUE;
     }
 #endif /* SOON */
 if (updated)
     {