5fe6a3b2ce5a7099de38022ab8875d5651797780
tdreszer
  Fri Dec 16 11:41:01 2011 -0800
Just a changed name tree wide.  The 'compositeLevel' paramter to closestToHome cart functions was confusing.  What it means is the request is for a setting one step above the tdb passed in.  It is used for view level controls where the model tdb is a subtrack.  This checkin has NO functional affect.
diff --git src/hg/lib/cart.c src/hg/lib/cart.c
index ab980d0..4944d1f 100644
--- src/hg/lib/cart.c
+++ src/hg/lib/cart.c
@@ -913,35 +913,35 @@
 }
 
 boolean cartVarExists(struct cart *cart, char *var)
 /* Return TRUE if variable is in cart. */
 {
 return hashFindVal(cart->hash, var) != NULL;
 }
 
 boolean cartListVarExists(struct cart *cart, char *var)
 /* Return TRUE if a list variable is in cart (list may still be empty). */
 {
 return cartVarExists(cart, cartMultShadowVar(cart, var));
 }
 
 boolean cartListVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb,
-				  boolean compositeLevel, char *suffix)
+				  boolean parentLevel, char *suffix)
 /* Return TRUE if a list variable for tdb->track (or tdb->parent->track,
  * or tdb->parent->parent->track, etc.) is in cart (list itself may be NULL). */
 {
-if (compositeLevel)
+if (parentLevel)
     tdb = tdb->parent;
 for ( ; tdb != NULL; tdb = tdb->parent)
     {
     char var[PATH_LEN];
     if (suffix[0] == '.' || suffix[0] == '_')
         safef(var, sizeof var, "%s%s%s", cgiMultListShadowPrefix(), tdb->track, suffix);
     else
         safef(var, sizeof var, "%s%s.%s", cgiMultListShadowPrefix(), tdb->track, suffix);
     char *cartSetting = hashFindVal(cart->hash, var);
     if (cartSetting != NULL)
 	return TRUE;
     }
 return FALSE;
 }
 
@@ -1782,142 +1782,142 @@
     	    }
   	}
     hFreeConn(&conn);
     }
 else
     {
     while( ( lineFileChopNext(lf, words, sizeof(words)/sizeof(char *)) ))
     	{
     	dyStringPrintf(orderDY, "%s ",words[0]);
     	}
     }
 return dyStringCannibalize(&orderDY);
 }
 
 char *cartLookUpVariableClosestToHome(struct cart *cart, struct trackDb *tdb,
-	boolean compositeLevel, char *suffix,char **pVariable)
+	boolean parentLevel, char *suffix,char **pVariable)
 /* Returns value or NULL for a cart variable from lowest level on up. Optionally
  * fills the non NULL pVariable with the actual name of the variable in the cart */
 {
-if (compositeLevel)
+if (parentLevel)
     tdb = tdb->parent;
 for ( ; tdb != NULL; tdb = tdb->parent)
     {
     char buf[512];
     if (suffix[0] == '.' || suffix[0] == '_')
         safef(buf, sizeof buf, "%s%s", tdb->track,suffix);
     else
         safef(buf, sizeof buf, "%s.%s", tdb->track,suffix);
     char *cartSetting = hashFindVal(cart->hash, buf);
     if (cartSetting != NULL)
 	{
 	if(pVariable != NULL)
 	    *pVariable = cloneString(buf);
 	return cartSetting;
 	}
     }
 if (pVariable != NULL)
     *pVariable = NULL;
 return NULL;
 }
 
-void cartRemoveVariableClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix)
+void cartRemoveVariableClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix)
 /* Looks for then removes a cart variable from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
 char *var = NULL;
-(void)cartLookUpVariableClosestToHome(cart,tdb,compositeLevel,suffix,&var);
+(void)cartLookUpVariableClosestToHome(cart,tdb,parentLevel,suffix,&var);
 if(var != NULL)
     {
     cartRemove(cart,var);
     freeMem(var);
     }
 }
 
-char *cartStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix)
+char *cartStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix)
 /* Returns value or Aborts for a cart string from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix);
 if(setting == NULL)
     errAbort("cartStringClosestToHome: '%s' not found", suffix);
 return setting;
 }
 
-boolean cartVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix)
+boolean cartVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix)
 /* Returns TRUE if variable exists anywhere, looking from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-return (NULL != cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix));
+return (NULL != cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix));
 }
 
 
-char *cartUsualStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix, char *usual)
+char *cartUsualStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, char *usual)
 /* Returns value or {usual} for a cart string from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix);
 if(setting == NULL)
     setting = usual;
 return setting;
 }
 
-boolean cartBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix)
+boolean cartBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix)
 /* Returns value or Aborts for a cart boolean ('on' or != 0) from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartStringClosestToHome(cart,tdb,parentLevel,suffix);
 return (sameString(setting, "on") || atoi(setting) > 0);
 }
 
-boolean cartUsualBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix,boolean usual)
+boolean cartUsualBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix,boolean usual)
 /* Returns value or {usual} for a cart boolean ('on' or != 0) from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix);
 if(setting == NULL)
     return usual;
 return (sameString(setting, "on") || atoi(setting) > 0);
 }
 
 
-int cartUsualIntClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix, int usual)
+int cartUsualIntClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, int usual)
 /* Returns value or {usual} for a cart int from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix);
 if (setting == NULL)
     return usual;
 return atoi(setting);
 }
 
-double cartUsualDoubleClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix, double usual)
+double cartUsualDoubleClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, double usual)
 /* Returns value or {usual} for a cart fp double from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
-char *setting = cartOptionalStringClosestToHome(cart,tdb,compositeLevel,suffix);
+char *setting = cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix);
 if (setting == NULL)
     return usual;
 return atof(setting);
 }
 
-struct slName *cartOptionalSlNameListClosestToHome(struct cart *cart, struct trackDb *tdb, boolean compositeLevel, char *suffix)
+struct slName *cartOptionalSlNameListClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix)
 /* Return slName list (possibly with multiple values for the same var) from lowest level on up:
    subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */
 {
 char *var = NULL;
-cartLookUpVariableClosestToHome(cart,tdb,compositeLevel,suffix,&var);
+cartLookUpVariableClosestToHome(cart,tdb,parentLevel,suffix,&var);
 if(var == NULL)
     return NULL;
 
 struct slName *slNames = cartOptionalSlNameList(cart,var);
 freeMem(var);
 return slNames;
 }
 
 void cartRemoveAllForTdb(struct cart *cart, struct trackDb *tdb)
 /* Remove all variables from cart that are associated with this tdb. */
 {
 char setting[256];
 safef(setting,sizeof(setting),"%s.",tdb->track);
 cartRemovePrefix(cart,setting);
 safef(setting,sizeof(setting),"%s_",tdb->track); // TODO: All should be {track}.{varName}... Fix {track}_sel
@@ -1928,32 +1928,32 @@
 void cartRemoveAllForTdbAndChildren(struct cart *cart, struct trackDb *tdb)
 /* Remove all variables from cart that are associated
    with this tdb and it's children. */
 {
 struct trackDb *subTdb;
 for(subTdb=tdb->subtracks;subTdb!=NULL;subTdb=subTdb->next)
     cartRemoveAllForTdbAndChildren(cart,subTdb);
 cartRemoveAllForTdb(cart,tdb);
         saveState(cart);
 }
 
 char *cartOrTdbString(struct cart *cart, struct trackDb *tdb, char *var, char *defaultVal)
 /* Look first in cart, then in trackDb for var.  Return defaultVal if not found. */
 {
 char *tdbDefault = trackDbSettingClosestToHomeOrDefault(tdb, var, defaultVal);
-boolean compositeLevel = isNameAtCompositeLevel(tdb, var);
-return cartUsualStringClosestToHome(cart, tdb, compositeLevel, var, tdbDefault);
+boolean parentLevel = isNameAtParentLevel(tdb, var);
+return cartUsualStringClosestToHome(cart, tdb, parentLevel, var, tdbDefault);
 }
 
 int cartOrTdbInt(struct cart *cart, struct trackDb *tdb, char *var, int defaultVal)
 /* Look first in cart, then in trackDb for var.  Return defaultVal if not found. */
 {
 char *a = cartOrTdbString(cart, tdb, var, NULL);
 if (a == NULL)
     return defaultVal;
 else
     return atoi(a);
 }
 
 
 double cartOrTdbDouble(struct cart *cart, struct trackDb *tdb, char *var, double defaultVal)
 /* Look first in cart, then in trackDb for var.  Return defaultVal if not found. */