7c96305a8cc177ad7792386ab9978f66fc82e0a2 braney Thu Nov 8 14:26:53 2018 -0800 make filterBy and labels be smarter about being configured at the view level diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 021a26d..460975c 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -152,31 +152,31 @@ else { filter->comparisonType = COMPARE_WILDCARD; filter->wildCardString = cloneString(value); } return filter; } struct bigBedFilter *bigBedMakeFilterBy(struct cart *cart, struct bbiFile *bbi, struct trackDb *tdb, char *field, struct slName *choices) /* Add a bigBed filter using a trackDb filterBy statement. */ { struct bigBedFilter *filter; char filterType[4096]; safef(filterType, sizeof filterType, "%s%s", field, FILTER_TYPE_NAME); -char *setting = cartOrTdbString(cart, tdb, filterType, NULL); +char *setting = cartOrTdbString(cart, tdb, filterType, FILTERBY_SINGLE); AllocVar(filter); filter->fieldNum = bbExtraFieldIndex(bbi, field) + 3; if (setting && (sameString(setting, FILTERBY_SINGLE_LIST) || sameString(setting, FILTERBY_MULTIPLE_LIST_OR))) filter->comparisonType = COMPARE_HASH_LIST_OR; else if (setting && sameString(setting, FILTERBY_MULTIPLE_LIST_AND)) filter->comparisonType = COMPARE_HASH_LIST_AND; else filter->comparisonType = COMPARE_HASH; filter->valueHash = newHash(5); filter->numValuesInHash = slCount(choices); for(; choices; choices = choices->next) hashStore(filter->valueHash, choices->name);