src/hg/lib/trackDbCustom.c 1.77

Index: src/hg/lib/trackDbCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/trackDbCustom.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -b -B -U 4 -r1.76 -r1.77
--- src/hg/lib/trackDbCustom.c	4 Feb 2010 22:58:17 -0000	1.76
+++ src/hg/lib/trackDbCustom.c	5 Feb 2010 01:09:43 -0000	1.77
@@ -341,8 +341,9 @@
 	word = nextWord(&line);
 	if (line == NULL)
 	    errAbort("No value for %s line %d of %s", word, lf->lineIx, lf->fileName);
 	line = trimSpaces(line);
+	trackDbUpdateOldTag(&word, &line);
 	trackDbAddInfo(bt, word, line, lf);
 	}
     if (trackDbLocalSetting(bt, "compositeTrack") != NULL)
         hashAdd(compositeHash, bt->tableName, bt);
@@ -901,9 +902,12 @@
 /* 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);
@@ -1046,16 +1050,17 @@
 char *tag = *pTag;
 char *val = *pVal;
 boolean updated = FALSE;
 
-if (sameString(tag, "compositeTrack"))
+#ifdef SOON
+if (sameString(tag, "subTrack"))
     {
-    tag = "container";
-    val = "composite";
+    tag = "parent";
     }
-else if (sameString(tag, "subTrack"))
+else if (sameString(tag, "compositeTrack"))
     {
-    tag = "parent";
+    tag = "container";
+    val = "composite";
     }
 else if (sameString(tag, "superTrack"))
     {
     if (sameWord(val, "on"))
@@ -1067,8 +1072,9 @@
         {
 	tag = "parent";
 	}
     }
+#endif /* SOON */
 if (updated)
     {
     *pTag = cloneString(tag);
     *pVal = cloneString(val);