c5485693d13311a45858c5bf4fb2f93f0ff4c6e9
aamp
  Sat May 7 05:50:18 2011 -0700
something was a bit off with this maCombineGroupingFromCart function to say the least
diff --git src/hg/lib/microarray.c src/hg/lib/microarray.c
index 1299185..6e16290 100644
--- src/hg/lib/microarray.c
+++ src/hg/lib/microarray.c
@@ -882,50 +882,45 @@
 s = hashFindVal(mainGroup, "subset");
 if (s)
     ret->subsetSettings = maGetGroupingsFromList(s, allGroups);
 ret->numCombinations = slCount(ret->combineSettings);
 ret->numSubsets = slCount(ret->subsetSettings);
 hashFreeList(&hashList);
 return ret;
 }
 
 struct maGrouping *maCombineGroupingFromCart(struct microarrayGroups *groupings, 
 				    struct cart *cart, char *trackName)
 /* Determine which grouping to use based on the cart status or lack thereof. */
 {
 char *setting = NULL;
 char cartVar[512];
-struct maGrouping *ret = NULL;
 /* Possibly NULL from custom trackness. */
 if (!groupings)
     return NULL;
 safef(cartVar, sizeof(cartVar), "%s.combine", trackName);
 setting = cartUsualString(cart, cartVar, NULL);
 if (setting && sameWord(groupings->allArrays->name, setting))
     return groupings->allArrays;
 if (setting)
     {
     struct maGrouping *cur;
     for (cur = groupings->combineSettings; cur != NULL; cur = cur->next)
 	if (sameWord(cur->name, setting))
 	    return cur;
     }
-if (ret == NULL)
-    ret = groupings->defaultCombine;
-if (ret == NULL)
-    ret = groupings->allArrays;
-return ret;
+return groupings->defaultCombine;
 }
 
 /********* Dealing with BED. ************/
 
 struct expData *maExpDataFromExpBed(struct bed *oneBed)
 /* Convert a bed record's expScores into an expData. */
 {
 struct expData *ret = NULL;
 AllocVar(ret);
 ret->name = cloneString(oneBed->name);
 ret->expCount = oneBed->expCount;
 if (ret->expCount > 0) 
     ret->expScores = CloneArray(oneBed->expScores, oneBed->expCount);
 return ret;
 }