e9db6a582316b2ba5ec6aa29f5e4a2bc10d255cb aamp Wed Jun 8 01:08:31 2011 -0700 bugfix for microarray tracks with no default grouping e.g. rinnSex (mm7/mm8) diff --git src/hg/lib/microarray.c src/hg/lib/microarray.c index 54036d3..3643c85 100644 --- src/hg/lib/microarray.c +++ src/hg/lib/microarray.c @@ -1034,31 +1034,33 @@ char *setting = NULL; char *cartVar = expRatioCombineDLName(trackName); /* Possibly NULL from custom trackness. */ if (!groupings) return NULL; 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 (groupings->defaultCombine) return groupings->defaultCombine; +return groupings->allArrays; } /* int maSubsetOffsetFromCart(struct microarrayGroups *groupings, struct cart *cart, char *trackName) */ struct maGrouping *maSubsetGroupingFromCart(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 = expRatioSubsetRadioName(trackName, groupings); /* Possibly NULL from custom trackness. */ if (!groupings) return NULL; setting = cartUsualString(cart, cartVar, NULL); if (setting)