88d620e6c8269c77b8c4c646e974c74872fc089d braney Fri May 9 12:22:38 2025 -0700 make allwaysItemRgb hg.conf variable to be on by default diff --git src/hg/cgilib/bedCart.c src/hg/cgilib/bedCart.c index 8f2cac5c15d..172c237849a 100644 --- src/hg/cgilib/bedCart.c +++ src/hg/cgilib/bedCart.c @@ -1,49 +1,35 @@ /* bedCart.c - take care of parsing values from the * bed trackDb optional settings and the same values that may be * in the cart. */ /* Copyright (C) 2014 The Regents of the University of California * See kent/LICENSE or http://genome.ucsc.edu/license/ for licensing information. */ #include "common.h" #include "jksql.h" #include "trackDb.h" #include "cart.h" #include "dystring.h" #include "bedCart.h" #include "hgConfig.h" #if defined(NOT_YET) extern struct cart *cart; /* defined in hgTracks.c or hgTrackUi */ /* This option isn't in the cart yet ... maybe later */ #endif -/****** itemRgb - not on by default **************************/ +/****** itemRgb - on by default **************************/ boolean bedItemRgb(struct trackDb *tdb) { -char *Default="Off"; /* anything different than this will turn it on */ -char *tdbDefault = (char *)NULL; +if (tdb == NULL) + return TRUE; -if (tdb) - { - tdbDefault = trackDbSettingClosestToHome(tdb, OPT_ITEM_RGB); +if ((trackDbSettingClosestToHome(tdb, "color") != NULL) || trackDbSettingOff(tdb, OPT_ITEM_RGB)) + return FALSE; - // If the hg.conf statement is set on this server to activate the new behavior: - // only default to "on" if: - // - "color" is not present at all - // - itemRgb=off is not set - if (cfgOptionBooleanDefault("alwaysItemRgb", FALSE) && - (trackDbSettingClosestToHome(tdb, "color")==NULL) && - !sameWordOk(Default,tdbDefault)) - return TRUE; - } +if ((cfgOptionBooleanDefault("alwaysItemRgb", TRUE) == FALSE)) + return FALSE; -if (tdbDefault) - { - if (differentWord(Default,tdbDefault)) return TRUE; } - -return FALSE; -} /* boolean bedItemRgb(struct trackDb *tdb) */