src/hg/makeDb/hgTrackDb/hgTrackDb.c 1.61

1.61 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/makeDb/hgTrackDb/hgTrackDb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/hgTrackDb/hgTrackDb.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -B -U 4 -r1.60 -r1.61
--- src/hg/makeDb/hgTrackDb/hgTrackDb.c	11 Jan 2010 18:25:47 -0000	1.60
+++ src/hg/makeDb/hgTrackDb/hgTrackDb.c	6 Feb 2010 21:43:02 -0000	1.61
@@ -176,9 +176,9 @@
     done = TRUE;
     nonOrphanList = NULL;
     while ((tdb = slPopHead(&tdbList)) != NULL)
 	{
-	char *parentName = cloneFirstWord(trackDbLocalSetting(tdb, "subTrack"));
+	char *parentName = cloneFirstWord(trackDbLocalSetting(tdb, "parent"));
 	struct hashEl *hel = NULL;
 	if (parentName != NULL)
 	    {
 	    hel = hashLookup(trackHash, parentName);
@@ -738,9 +738,9 @@
     for (td = tdbList; td != NULL; td = td->next)
 	{
         if (isEmpty(td->html))
 	    {
-	    if (strict && !trackDbLocalSetting(td, "subTrack") && !trackDbLocalSetting(td, "superTrack") &&
+	    if (strict && !trackDbLocalSetting(td, "parent") && !trackDbLocalSetting(td, "superTrack") &&
 	    	!sameString(td->tableName,"cytoBandIdeo"))
 		{
 		fprintf(stderr, "Warning: html missing for %s %s %s '%s'\n",org, database, td->tableName, td->shortLabel);
 		}