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 1000000 -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
@@ -1,794 +1,794 @@
 /* hgTrackDb - Create trackDb table from text files. */
 #include "common.h"
 #include "linefile.h"
 #include "hash.h"
 #include "options.h"
 #include "sqlList.h"
 #include "jksql.h"
 #include "trackDb.h"
 #include "hui.h"
 #include "hdb.h"
 #include "hVarSubst.h"
 #include "obscure.h"
 #include "portable.h"
 #include "dystring.h"
 
 static char const rcsid[] = "$Id$";
 
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
   "hgTrackDb - Create trackDb table from text files.\n\n"
   "Note that the browser supports multiple trackDb tables, usually\n"
   "in the form: trackDb_YourUserName. Which particular trackDb\n"
   "table the browser uses is specified in the hg.conf file found\n"
   "either in your home directory as '.hg.conf' or in the web \n"
   "server's cgi-bin directory as 'hg.conf'.\n"
   "usage:\n"
   "   hgTrackDb [options] org database trackDb_$(USER) trackDb.sql hgRoot\n"
   "\n"
   "Options:\n"
   "  -visibility=vis.ra - A ra file used to override the initial visibility\n"
   "   settings in trackDb.ra.  This is used to configure the initial setting\n"
   "   for special-purpose browsers.  All visibility will be set to hide and\n"
   "   then specific track are modified using the track and visibility fields\n"
   "   in this file.\n"
   "  -priority=priority.ra - A ra file used to override the priority settings\n"
   "  -hideFirst - Before applying vis.ra, set all visibilities to hide.\n"
   "  -strict - only include tables that exist (and complain about missing html files).\n"
   "  -raName=trackDb.ra - Specify a file name to use other than trackDb.ra\n"
   "   for the ra files.\n"
   "  -release=alpha|beta - Include trackDb entries with this release only.\n"
   "  -settings - for trackDb scanning, output table name, type line,\n"
   "            -  and settings hash to stderr while loading everything\n"
   );
 }
 
 static struct optionSpec optionSpecs[] = {
     {"visibility", OPTION_STRING},
     {"priority", OPTION_STRING},
     {"raName", OPTION_STRING},
     {"strict", OPTION_BOOLEAN},
     {"hideFirst", OPTION_BOOLEAN},
     {"release", OPTION_STRING},
     {"settings", OPTION_BOOLEAN},
     {NULL,      0}
 };
 
 static char *raName = "trackDb.ra";
 static char *release = "alpha";
 static bool showSettings = FALSE;
 
 static boolean hasNonAsciiChars(char *text)
 /* Check if text has any non-printing or non-ascii characters */
 {
 char *c;
 for (c = text; *c != '\0'; c++)
     {
     if ((*c <= 7) || ((14 <= *c) && (*c <= 31)) || (*c >= 127))
         {
         return TRUE;
         }
     }
 return FALSE;
 }
 
 
 static struct trackDb *trackDbListFromHash(struct hash *tdHash)
 /* Build a list of the tracks in hash.  List will be threaded through
  * the entries. */
 {
 struct trackDb *tdbList = NULL;
 struct hashCookie cookie = hashFirst(tdHash);
 struct hashEl *hel;
 while ((hel = hashNext(&cookie)) != NULL)
     slSafeAddHead(&tdbList, (struct trackDb*)hel->val);
 return tdbList;
 }
 
 static struct trackDb *pruneStrict(struct trackDb *tdbList, char *db)
 /* Remove tracks without data.  For parent tracks data in any child is sufficient to keep
  * them alive. */
 {
 struct trackDb *newList = NULL, *tdb, *next;
 for (tdb = tdbList; tdb != NULL; tdb = next)
     {
     next = tdb->next;
     verbose(3,"pruneStrict checking table: '%s'\n", tdb->tableName);
     if (tdb->subtracks != NULL)
 	{
 	tdb->subtracks = pruneStrict(tdb->subtracks, db);
 	}
     if (tdb->subtracks != NULL)
         {
 	slAddHead(&newList, tdb);
 	}
     else if (hTableOrSplitExists(db, tdb->tableName))
         {
 	slAddHead(&newList, tdb);
 	}
     else
 	verbose(3,"pruneStrict removing table: '%s'\n", tdb->tableName);
     }
 slReverse(&newList);
 return newList;
 }
 
 
 static struct trackDb *pruneEmptyContainers(struct trackDb *tdbList)
 /* Remove container tracks (views and compositeTracks) with no children. */
 {
 struct trackDb *newList = NULL, *tdb, *next;
 for (tdb = tdbList; tdb != NULL; tdb = next)
     {
     next = tdb->next;
     if (trackDbLocalSetting(tdb, "compositeTrack") || trackDbLocalSetting(tdb, "view"))
 	{
 	tdb->subtracks = pruneEmptyContainers(tdb->subtracks);
 	if (tdb->subtracks != NULL)
 	    slAddHead(&newList, tdb);
 	else
 	    verbose(3,"pruneEmptyContainers: empty track: '%s'\n",
 		tdb->tableName);
 	}
     else 
         {
 	slAddHead(&newList, tdb);
 	}
     }
 slReverse(&newList);
 return newList;
 }
 
 static struct trackDb * pruneRelease(struct trackDb *tdbList)
 /* Prune out alternate track entries for another release */
 {
 /* Build up list that only includes things in this release.  Release
  * can be inherited from parents. */
 struct trackDb *tdb;
 struct trackDb *relList = NULL;
 while ((tdb = slPopHead(&tdbList)) != NULL)
     {
     char *rel = trackDbSetting(tdb, "release");
     if (rel == NULL || sameString(rel, release))
 	{
 	/* Remove release tags in remaining tracks, since its purpose is served. */
 	hashRemove(tdb->settingsHash, "release");
 	slAddHead(&relList, tdb);
 	}
     else
 	verbose(3,"pruneRelease: removing '%s', release: '%s' != '%s'\n",
 	    tdb->tableName, rel, release);
     }
 return relList;
 }
 
 static struct trackDb * pruneOrphans(struct trackDb *tdbList, struct hash *trackHash)
 /* Prune out orphans with no parents of the right release */
 {
 boolean done = FALSE;
 struct trackDb *tdb;
 struct trackDb *nonOrphanList = NULL;
 while (!done)
     {
     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);
 	    }
 	if (parentName == NULL || hel != NULL)
 	    {
 	    slAddHead(&nonOrphanList, tdb);
 	    }
 	else
 	    {
 	    verbose(3,"pruneOrhans: removing '%s'\n",
 		tdb->tableName);
 	    hashRemove(trackHash, tdb->tableName);
 	    done = FALSE;
 	    }
 	freeMem(parentName);
 	}
     tdbList = nonOrphanList;
     }
 return tdbList;
 }
 
 static void applyOverride(struct hash *trackHash,
                           struct trackDb *overTd)
 /* Apply a trackDb override to a track, if it exists */
 {
 struct trackDb *tdb = hashFindVal(trackHash, overTd->tableName);
 if (tdb != NULL)
     trackDbOverride(tdb, overTd);
 }
 
 static void addVersionRa(boolean strict, char *database, char *dirName, char *raName,
                          struct hash *trackHash)
 /* Read in tracks from raName and add them to table, pruning as required. Call
  * top-down so that track override will work. */
 {
 struct trackDb *tdbList = trackDbFromRa(raName), *tdb;
 /* prune records of the incorrect release */
 tdbList= pruneRelease(tdbList);
 
 /* load tracks, replacing higher-level ones with lower-level and
  * applying overrides*/
 while ((tdb = slPopHead(&tdbList)) != NULL)
     {
     if (tdb->overrides != NULL)
 	applyOverride(trackHash, tdb);
     else
 	hashStore(trackHash, tdb->tableName)->val = tdb;
     }
 }
 
 void updateBigTextField(struct sqlConnection *conn, char *table,
      char *whereField, char *whereVal,
      char *textField, char *textVal)
 /* Generate sql code to update a big text field that may include
  * newlines and stuff. */
 {
 struct dyString *dy = newDyString(4096);
 dyStringPrintf(dy, "update %s set %s=", table, textField);
 dyStringQuoteString(dy, '"', textVal);
 dyStringPrintf(dy, " where %s = '%s'", whereField, whereVal);
 sqlUpdate(conn, dy->string);
 freeDyString(&dy);
 }
 
 char *substituteTrackName(char *create, char *tableName)
 /* Substitute tableName for whatever is between CREATE TABLE  and  first '('
    freez()'s create passed in. */
 {
 char newCreate[strlen(create) + strlen(tableName) + 10];
 char *front = NULL;
 char *rear = NULL;
 int length = (strlen(create) + strlen(tableName) + 10);
 /* try to find "TABLE" or "table" in create */
 front = strstr(create, "TABLE");
 if(front == NULL)
     front = strstr(create, "table");
 if(front == NULL)
     errAbort("hgTrackDb::substituteTrackName() - Can't find 'TABLE' in %s", create);
 
 /* try to find first "(" in string */
 rear = strstr(create, "(");
 if(rear == NULL)
     errAbort("hgTrackDb::substituteTrackName() - Can't find '(' in %s", create);
 
 /* set to NULL character after "TABLE" */
 front += 5;
 *front = '\0';
 
 safef(newCreate, length , "%s %s %s", create, tableName, rear);
 return cloneString(newCreate);
 }
 
 void layerOnRa(boolean strict, char *database, char *dir, struct hash *trackHash,
                boolean raMustExist)
 /* Read trackDb.ra from directory and layer them on top of whatever is in trackHash.
  * Must call top-down (root->org->assembly) */
 {
 char raFile[512];
 if (raName[0] != '/')
     safef(raFile, sizeof(raFile), "%s/%s", dir, raName);
 else
     safef(raFile, sizeof(raFile), "%s", raName);
 if (fileExists(raFile))
     {
     addVersionRa(strict, database, dir, raFile, trackHash);
     }
 else
     {
     if (raMustExist)
         errAbort("%s doesn't exist!", raFile);
     }
 }
 
 static void layerOnHtml(char *dirName, struct trackDb *tdbList)
 /* Read in track HTML call bottom-up. */
 {
 char fileName[512];
 struct trackDb *td;
 for (td = tdbList; td != NULL; td = td->next)
     {
     if (isEmpty(td->html))
         {
         char *htmlName = trackDbSetting(td, "html");
         if (htmlName == NULL)
             htmlName = td->tableName;
 	safef(fileName, sizeof(fileName), "%s/%s.html", dirName, htmlName);
 	if (fileExists(fileName))
             {
 	    readInGulp(fileName, &td->html, NULL);
             // Check for note ASCII characters at higher levels of verboseness.
             // Normally, these are acceptable ISO-8859-1 characters
             if  ((verboseLevel() >= 2) && hasNonAsciiChars(td->html))
                 verbose(2, "Note: non-printing or non-ASCII characters in %s\n", fileName);
             }
         }
     }
 }
 
 static char *settingsFromHash(struct hash *hash)
 /* Create settings string from settings hash. */
 {
 if (hash == NULL)
     return cloneString("");
 else
     {
     struct dyString *dy = dyStringNew(1024);
     char *ret;
     struct hashEl *el, *list = hashElListHash(hash);
     slSort(&list, hashElCmp);
     for (el = list; el != NULL; el = el->next)
 	dyStringPrintf(dy, "%s %s\n", el->name, (char *)el->val);
     slFreeList(&list);
     ret = cloneString(dy->string);
     dyStringFree(&dy);
     return ret;
     }
 }
 
 struct subGroupData
 /* composite group definitions */
 {
 struct hash *nameHash;   /* hash of subGroup names */
 struct trackDb *compositeTdb;  /* tdb of composite parent */
 };
 
 static struct hash *buildCompositeHash(struct trackDb *tdbList)
 /* Create a hash of all composite tracks.  This is keyed by their name with
  * subGroupData values. */
 {
 struct hash *compositeHash = newHash(8);
 
 /* process all composite tracks */
 struct trackDb *td, *tdNext;
 for (td = tdbList; td != NULL; td = tdNext)
     {
     tdNext = td->next;
     if (trackDbLocalSetting(td, "compositeTrack"))
 	{
 	int i;
 	struct subGroupData *sgd;
         char subGroupName[256];
         AllocVar(sgd);
 	sgd->compositeTdb = td;
 
 	for(i=1; ; i++)
 	    {
 	    safef(subGroupName, sizeof(subGroupName), "subGroup%d", i);
 	    char *sgSetting = trackDbSetting(td, subGroupName);
 	    if (!sgSetting)
 		break;
             sgSetting = cloneString(sgSetting);
 	    char *sgWord = sgSetting;
 	    char *sgName = nextWord(&sgWord);
 	    nextWord(&sgWord);  /* skip word not used */
 	    struct hash *subGroupHash = newHash(3);
 	    struct slPair *slPair, *slPairList = slPairFromString(sgWord);
             for (slPair = slPairList; slPair; slPair = slPair->next)
 		{
 		hashAdd(subGroupHash, slPair->name, slPair->val);
 		}
 	    if (sgd->nameHash == NULL)
 		sgd->nameHash = newHash(3);
 	    hashAdd(sgd->nameHash, sgName, subGroupHash);
 	    }
 	hashAdd(compositeHash, td->tableName, sgd);
 	}
     }
 return compositeHash;
 }
 
 static void checkOneSubGroups(char *compositeName, 
     struct trackDb *td, struct subGroupData *sgd)
 {
 char *subGroups = trackDbSetting(td, "subGroups");
 
 if (subGroups && (sgd->nameHash == NULL))
     {
     errAbort("subTrack %s has groups not defined in parent %s\n",
 	     td->tableName, compositeName);
     }
 else if (!subGroups && (sgd->nameHash != NULL))
     {
     errAbort("subtrack %s is missing subGroups defined in parent %s\n",  
 	td->tableName, compositeName);
     }
 
 if (!subGroups && (sgd->nameHash == NULL))
     return; /* nothing to do */
 
 assert(sgd->nameHash != NULL);
 
 struct slPair *slPair, *slPairList = slPairFromString(subGroups);
 struct hash *foundHash = newHash(3);
 for (slPair = slPairList; slPair; slPair = slPair->next)
     {
     struct hashEl *hel = hashLookup( sgd->nameHash, slPair->name);
     if (hel == NULL)
 	errAbort("subtrack %s has subGroup (%s) not found in parent\n", 
 	    td->tableName, slPair->name);
 
     struct hash *subHash = hel->val;
     hashStore(foundHash, slPair->name);
 
     if (hashLookup(subHash, slPair->val) == NULL)
 	{
 	errAbort("subtrack %s has subGroup (%s) with value (%s) not found in parent\n", 
 	    td->tableName, slPair->name, (char *)slPair->val);
 	}
     }
 
 struct hashCookie cookie = hashFirst(sgd->nameHash);
 struct hashEl *hel;
 while ((hel = hashNext(&cookie)) != NULL)
     {
     if (hashLookup(foundHash, hel->name) == NULL)
 	errAbort("subtrack %s is missing required subGroup %s\n", 
 	    td->tableName, hel->name);
     }
 
 }
 
 static void verifySubTracks(struct trackDb *tdbList, struct hash *compositeHash)
 /* Verify subGroup relelated settings in subtracks, assisted by compositeHash */
 {
 struct trackDb *tdb;
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     {
     struct trackDb *parent = tdb->parent;
     if (parent && parent->subtracks)  /* Second part of if is to escape superTrack system. */
 	{
 	/* Look for some ancestor in composite hash and set sgd to it. */
 	struct subGroupData *sgd = NULL;
 	for (;parent != NULL; parent = parent->parent)
 	    {
 	    sgd = hashFindVal(compositeHash, parent->tableName);
 	    if (sgd != NULL)
 	        break;
 	    }
 	assert(sgd != NULL);	
 	checkOneSubGroups(parent->tableName, tdb, sgd);
 	}
     }
 }
 
 static void checkSubGroups(struct trackDb *tdbList)
 /* Check integrity of subGroup clauses */
 {
 struct hash *compositeHash = buildCompositeHash(tdbList);
 
 verifySubTracks(tdbList, compositeHash);
 }
 
 
 static void prioritizeContainerItems(struct trackDb *tdbList)
 /* Set priorities in containers if they have no priorities already set
    priorities are based upon 'sortOrder' setting or else shortLabel */
 {
 int countOfSortedContainers = 0;
 
 // Walk through tdbs looking for containers
 struct trackDb *tdbContainer;
 for (tdbContainer = tdbList; tdbContainer != NULL; tdbContainer = tdbContainer->next)
     {
     if (tdbContainer->subtracks == NULL)
         continue;
 
     sortOrder_t *sortOrder = sortOrderGet(NULL,tdbContainer);
     boolean needsSorting = TRUE; // default
     float firstPriority = -1.0;
     sortableTdbItem *item,*itemsToSort = NULL;
 
     struct slRef *child, *childList = trackDbListGetRefsToDescendantLeaves(tdbContainer->subtracks);
     // Walk through tdbs looking for items contained
     for (child = childList; child != NULL; child = child->next)
         {
 	struct trackDb *tdbItem = child->val;
 	if( needsSorting && sortOrder == NULL )  // do we?
 	    {
 	    if( firstPriority == -1.0)    // all 0 or all the same value
 		firstPriority = tdbItem->priority;
 	    if(firstPriority != tdbItem->priority && (int)(tdbItem->priority + 0.9) > 0)
 		{
 		needsSorting = FALSE;
 		break;
 		}
 	    }
 	// create an Item
 	item = sortableTdbItemCreate(tdbItem,sortOrder);
 	if(item != NULL)
 	    slAddHead(&itemsToSort, item);
 	else
 	    {
 	    verbose(1,"Error: '%s' missing shortLabels or sortOrder setting is inconsistent.\n",tdbContainer->tableName);
 	    needsSorting = FALSE;
 	    sortableTdbItemCreate(tdbItem,sortOrder);
 	    break;
 	    }
         }
 
     // Does this container need to be sorted?
     if(needsSorting && slCount(itemsToSort))
         {
         verbose(2,"Sorting '%s' with %d items\n",tdbContainer->tableName,slCount(itemsToSort));
         sortTdbItemsAndUpdatePriorities(&itemsToSort);
         countOfSortedContainers++;
         }
 
     // cleanup
     sortOrderFree(&sortOrder);
     sortableTdbItemsFree(&itemsToSort);
     }
 if(countOfSortedContainers > 0)
     verbose(1,"Sorted %d containers\n",countOfSortedContainers);
 }
 
 static void inheritFieldsFromParents(struct trackDb *tdb, struct trackDb *parent)
 /* Inherit undefined fields (outside of settings) from parent. */
 {
 if (tdb->shortLabel == NULL)
     tdb->shortLabel = cloneString(parent->shortLabel);
 if (tdb->type == NULL)
     tdb->type = cloneString(parent->type);
 if (tdb->longLabel == NULL)
     tdb->longLabel = cloneString(parent->longLabel);
 if (tdb->restrictList == NULL)
     tdb->restrictList = parent->restrictList;
 if (tdb->url == NULL)
     tdb->url = cloneString(parent->url);
 if (tdb->grp == NULL)
     tdb->grp = cloneString(parent->grp);
 if (tdb->canPack == 2 && parent->canPack != 2)
     tdb->canPack = parent->canPack;
 if (parent->private)
     tdb->private = TRUE;
 if (parent->useScore)
     tdb->useScore = TRUE;
 }
 
 
 
 static void rFillInFromParents(struct trackDb *parent, struct trackDb *tdbList)
 /* Fill in some possibly missing fields recursively. */
 {
 struct trackDb *tdb;
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     {
     if (parent != NULL)
 	inheritFieldsFromParents(tdb, parent);
     rFillInFromParents(tdb, tdb->subtracks);
     }
 }
 
 static void rPolish(struct trackDb *tdbList)
 /* Call polisher on list and all children of list. */
 {
 struct trackDb *tdb;
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     {
     trackDbPolish(tdb);
     rPolish(tdb->subtracks);
     }
 }
 
 static void polishSupers(struct trackDb *tdbList)
 /* Run polish on supertracks. */
 {
 struct trackDb *tdb;
 for (tdb = tdbList; tdb != NULL; tdb = tdb->next)
     {
     struct trackDb *parent = tdb->parent;
     if (parent != NULL)
 	trackDbPolish(parent);
     }
 }
 
 static struct trackDb *buildTrackDb(char *org, char *database, char *hgRoot,
                                     char *visibilityRa, char *priorityRa,
                                     boolean strict)
 /* Build trackDb objects from files. */
 {
 struct hash *trackHash = newHash(0);
 char rootDir[PATH_LEN], orgDir[PATH_LEN], asmDir[PATH_LEN];
 
 /* Create track list from hgRoot and hgRoot/org and hgRoot/org/assembly
  * ra format database. */
 
 safef(rootDir, sizeof(rootDir), "%s", hgRoot);
 safef(orgDir, sizeof(orgDir), "%s/%s", hgRoot, org);
 safef(asmDir, sizeof(asmDir), "%s/%s/%s", hgRoot, org, database);
 
 /* Must call these top-down.
  * Also prunes things not in our release. */
 layerOnRa(strict, database, rootDir, trackHash, TRUE);
 layerOnRa(strict, database, orgDir, trackHash, FALSE);
 layerOnRa(strict, database, asmDir, trackHash, FALSE);
 
 #ifdef OLD
 if (visibilityRa != NULL)
     trackDbOverrideVisbility(trackHash, visibilityRa, optionExists("hideFirst"));
 if (priorityRa != NULL)
     trackDbOverridePriority(trackHash, priorityRa);
 #endif /* OLD */
 
 /* Represent hash as list */
 struct trackDb *tdbList = trackDbListFromHash(trackHash);
 
 /* Get rid of orphans with no parent of the correct release. */
 tdbList = pruneOrphans(tdbList, trackHash);
 
 /* After this the hash is no longer needed, so get rid of it. */
 hashFree(&trackHash);
 
 /* Read in HTML bits onto what remains. */
 layerOnHtml(asmDir, tdbList);
 layerOnHtml(orgDir, tdbList);
 layerOnHtml(rootDir, tdbList);
 
 /* Set up parent/subtracks pointers. */
 tdbList = trackDbLinkUpGenerations(tdbList);
 
 /* Fill in missing info in fields (but not settings) from parents. */
 rFillInFromParents(NULL, tdbList);
 
 /* Fill in any additional missing info from defaults. */
 rPolish(tdbList);
 polishSupers(tdbList);
 
 /* Optionally check for tables/tracks that actually exist and get rid of ones that don't. */
 if (strict)
     tdbList = pruneStrict(tdbList, database);
 
 tdbList = pruneEmptyContainers(tdbList);
 checkSubGroups(tdbList);
 prioritizeContainerItems(tdbList);
 return tdbList;
 }
 
 static struct trackDb *flatten(struct trackDb *tdbForest)
 /* Convert our peculiar forest back to a list. 
  * This for now rescues superTracks from the heavens. */
 {
 struct hash *superTrackHash = hashNew(0);
 struct slRef *ref, *refList = trackDbListGetRefsToDescendants(tdbForest);
 
 struct trackDb *tdbList = NULL;
 for (ref = refList; ref != NULL; ref = ref->next)
     {
     struct trackDb *tdb = ref->val;
     struct trackDb *parent = tdb->parent;
     if (parent != NULL && parent->subtracks == NULL) /* Our supertrack clue. */
 	{
 	/* The supertrack may appear as a 'floating' parent for multiple tracks.
 	 * Only put it on the list once. */
 	if (!hashLookup(superTrackHash, parent->tableName))
 	    {
 	    hashAdd(superTrackHash, parent->tableName, parent);
 	    slAddHead(&tdbList, parent);
 	    }
 	}
     slAddHead(&tdbList, tdb);
     }
 
 slFreeList(&refList);
 hashFree(&superTrackHash);
 slReverse(&tdbList);
 return tdbList;
 }
 
 void hgTrackDb(char *org, char *database, char *trackDbName, char *sqlFile, char *hgRoot,
                char *visibilityRa, char *priorityRa, boolean strict)
 /* hgTrackDb - Create trackDb table from text files. */
 {
 struct trackDb *td;
 char tab[PATH_LEN];
 safef(tab, sizeof(tab), "%s.tab", trackDbName);
 
 struct trackDb *tdbList = buildTrackDb(org, database, hgRoot,
                                       visibilityRa, priorityRa, strict);
 tdbList = flatten(tdbList);
 slSort(&tdbList, trackDbCmp);
 verbose(1, "Loaded %d track descriptions total\n", slCount(tdbList));
 
 /* Write to tab-separated file; hold off on html, since it must be encoded */
     {
     FILE *f = mustOpen(tab, "w");
     for (td = tdbList; td != NULL; td = td->next)
         {
         hVarSubstTrackDb(td, database);
         char *hold = td->html;
         td->html = "";
 	trackDbTabOut(td, f);
         td->html = hold;
         }
     carefulClose(&f);
     }
 
 /* Update database */
     {
     char *create, *end;
     char query[256];
     struct sqlConnection *conn = sqlConnect(database);
 
     /* Load in table definition. */
     readInGulp(sqlFile, &create, NULL);
     create = trimSpaces(create);
     create = substituteTrackName(create, trackDbName);
     end = create + strlen(create)-1;
     if (*end == ';') *end = 0;
     sqlRemakeTable(conn, trackDbName, create);
 
     /* Load in regular fields. */
     safef(query, sizeof(query), "load data local infile '%s' into table %s", tab, trackDbName);
     sqlUpdate(conn, query);
 
     /* Load in html and settings fields. */
     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);
 		}
 	    }
 	else
 	    {
 	    updateBigTextField(conn,  trackDbName, "tableName", td->tableName, "html", td->html);
 	    }
 	if (td->settingsHash != NULL)
 	    {
 	    char *settings = settingsFromHash(td->settingsHash);
 	    updateBigTextField(conn, trackDbName, "tableName", td->tableName,
 	    	"settings", settings);
 	    if (showSettings)
 		{
 		verbose(1, "%s: type='%s';", td->tableName, td->type);
 		if (isNotEmpty(settings))
 		    {
 		    char *oneLine = replaceChars(settings, "\n", "; ");
 		    eraseTrailingSpaces(oneLine);
 		    verbose(1, " %s", oneLine);
 		    freeMem(oneLine);
 		    }
 		verbose(1, "\n");
 		}
 	    freeMem(settings);
 	    }
 	}
 
     sqlDisconnect(&conn);
     verbose(1, "Loaded database %s\n", database);
     }
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
 optionInit(&argc, argv, optionSpecs);
 if (argc != 6)
     usage();
 raName = optionVal("raName", raName);
 showSettings = optionExists("settings");
 if (strchr(raName, '/') != NULL)
     errAbort("-raName value should be a file name without directories");
 release = optionVal("release", release);
 
 hgTrackDb(argv[1], argv[2], argv[3], argv[4], argv[5],
           optionVal("visibility", NULL), optionVal("priority", NULL),
           optionExists("strict"));
 return 0;
 }