src/hg/lib/trackDbCustom.c 1.88

Index: src/hg/lib/trackDbCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/trackDbCustom.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -b -B -U 4 -r1.87 -r1.88
--- src/hg/lib/trackDbCustom.c	11 May 2010 01:43:30 -0000	1.87
+++ src/hg/lib/trackDbCustom.c	11 May 2010 19:07:24 -0000	1.88
@@ -152,65 +152,12 @@
                           char *var)
 /* Update override one field from override. */
 {
 if (sameString(var, "track"))
-    {
-    // skip
-    }
-else if (sameString(var, "shortLabel") || sameString(var, "name"))
-    replaceStr(&td->shortLabel, overTd->shortLabel);
-else if (sameString(var, "longLabel") || sameString(var, "description"))
-    replaceStr(&td->longLabel, overTd->longLabel);
-else if (sameString(var, "priority"))
-    td->priority = overTd->priority;
-else if (sameWord(var, "url"))
-    replaceStr(&td->url, overTd->url);
-else if (sameString(var, "visibility"))
-    td->visibility =  overTd->visibility;
-else if (sameWord(var, "color"))
-    {
-    td->colorR = overTd->colorR;
-    td->colorG = overTd->colorG;
-    td->colorB = overTd->colorB;
-    }
-else if (sameWord(var, "altColor"))
-    {
-    td->altColorR = overTd->altColorR;
-    td->altColorG = overTd->altColorG;
-    td->altColorB = overTd->altColorB;
-    }
-else if (sameWord(var, "type"))
-    replaceStr(&td->type, overTd->type);
-else if (sameWord(var, "spectrum") || sameWord(var, "useScore"))
-    td->useScore = overTd->useScore;
-else if (sameWord(var, "canPack"))
-    td->canPack = overTd->canPack;
-else if (sameWord(var, "chromosomes"))
-    {
-    // just format and re-parse
-    char *sa = sqlStringArrayToString(overTd->restrictList, overTd->restrictCount);
-    sqlStringFreeDynamicArray(&td->restrictList);
-    sqlStringDynamicArray(sa, &td->restrictList, &td->restrictCount);
-    freeMem(sa);
-    }
-else if (sameWord(var, "private"))
-    td->private = overTd->private;
-else if (sameWord(var, "group"))
-    {
-    replaceStr(&td->grp, overTd->grp);
-    }
-else if (sameWord(var, "release"))
-    {
-    // ignore -- it was pruned by pruneRelease before this was called.
-    }
-else	/* Add to settings. */
-    {
-    if (td->settingsHash == NULL)
-	td->settingsHash = hashNew(7);
-    char *val = hashMustFindVal(overTd->settingsHash, var);
-    struct hashEl *hel = hashStore(td->settingsHash, var);
-    replaceStr((char**)&hel->val, val);
-    }
+    return;
+char *val = hashMustFindVal(overTd->settingsHash, var);
+struct hashEl *hel = hashStore(td->settingsHash, var);
+replaceStr((char**)&hel->val, val);
 }
 
 void trackDbOverride(struct trackDb *td, struct trackDb *overTd)
 /* apply an trackOverride trackDb entry to a trackDb entry */
@@ -218,9 +165,11 @@
 assert(overTd->overrides != NULL);
 struct hashEl *hel;
 struct hashCookie hc = hashFirst(overTd->overrides);
 while ((hel = hashNext(&hc)) != NULL)
+    {
     overrideField(td, overTd, hel->name);
+    }
 }
 
 static boolean packableType(char *type)
 /* Return TRUE if we can pack this type. */