ba6e961593b24def506fa73e55d31542fb780a88 max Mon Apr 27 12:35:33 2020 -0700 Revert "adding multipleListOnlyAnd and multipleListOnlyOr to bigBed handling code. refs #25136" This reverts commit 86b389767dc3185b8fd02cbe21276d65df7f1667. diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 07606ff..28f175b 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -140,36 +140,33 @@ 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 *setting = getFilterType(cart, tdb, field, FILTERBY_SINGLE); AllocVar(filter); filter->fieldNum = getFieldNum(bbi, field); -if (setting && (sameString(setting, FILTERBY_SINGLE_LIST) - || sameString(setting, FILTERBY_MULTIPLE_LIST_OR) - || sameString(setting, FILTERBY_MULTIPLE_LIST_ONLY_OR))) +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) - || sameString(setting, FILTERBY_MULTIPLE_LIST_ONLY_AND)) +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); return filter; } struct bigBedFilter *bigBedBuildFilters(struct cart *cart, struct bbiFile *bbi, struct trackDb *tdb) /* Build all the numeric and filterBy filters for a bigBed */ {