628ff9b7267bf4b9e72f21c8888f9a014788bca8
kate
  Wed Feb 5 13:00:09 2020 -0800
Change values of hideEmptySubtracks to on/off for better clarity (by popular demand). refs #23365

diff --git src/hg/lib/hui.c src/hg/lib/hui.c
index 32eb57f..c09eaab 100644
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@ -5210,56 +5210,55 @@
 puts("'>");
 dyStringFree(&dyHtml)
 
 // save count of subtracks for use by footer code
 int subCount = slCount(subtrackRefList);
 
 printSubtrackTableHeader(parentTdb, subtrackRefList, settings);
 printSubtrackTableBody(parentTdb, subtrackRefList, settings, cart);
 printSubtrackTableFooter(subCount, settings);
 puts("</TABLE>");
 }
 
 boolean compositeHideEmptySubtracksSetting(struct trackDb *tdb, boolean *retDefault,
                                         char **retMultiBedFile, char **retSubtrackIdFile)
 /* Parse hideEmptySubtracks setting
- * Format:  hideEmptySubtracks on|default
+ * Format:  hideEmptySubtracks on|off
  *              or
- *          hideEmptySubtracks on|default multiBed.bed subtrackIds.tab
+ *          hideEmptySubtracks on|off multiBed.bed subtrackIds.tab
  * where multiBed.bed is a bed3Sources bigBed, generated with bedtools multiinter
  *              post-processed by UCSC multiBed.pl tool
  *      subtrackIds.tab is a tab-sep file: id subtrackName
  *
- * Return TRUE if set to true/on/default.  retDefault is TRUE if set default, o/w FALSE
+ * Return TRUE if setting is present.  retDefault is TRUE if set to 'on', o/w FALSE
  */
 {
 if (!tdbIsComposite(tdb))
     return FALSE;
 char *hideEmpties = cloneString(trackDbSetting(tdb, SUBTRACK_HIDE_EMPTY));
 if (!hideEmpties)
     return FALSE;
 char *orig = cloneString(hideEmpties);
 char *words[3];
 int wordCount = chopByWhite(hideEmpties, words, ArraySize(words));
 char *mode = words[0];
-if (differentString(mode, "on") && differentString(mode, "true") &&
-    differentString(mode, "default"))
+if (differentString(mode, "on") && differentString(mode, "off"))
     {
     warn("Track %s %s setting invalid: %s", tdb->track, SUBTRACK_HIDE_EMPTY, orig);
     return FALSE;
     }
-boolean deflt = sameString(mode, "default") ? TRUE : FALSE;
+boolean deflt = sameString(mode, "on") ? TRUE : FALSE;
 if (retDefault)
     *retDefault = deflt;
 
 if (wordCount == 1)
     return TRUE;
 if (wordCount != 3)
     {
     warn("Track %s %s setting invalid: %s", tdb->track, SUBTRACK_HIDE_EMPTY, orig);
     return FALSE;
     }
 // multi-bed specified (to speed display)
 if (retMultiBedFile)
     *retMultiBedFile = cloneString(hReplaceGbdb(words[1]));
 if (retSubtrackIdFile)
     *retSubtrackIdFile = cloneString(hReplaceGbdb(words[2]));