ceb57b4c14032bbba368796177103a468a078871 braney Fri Jul 3 18:05:47 2020 -0700 oops... broke highlightby in filterBy statements diff --git src/hg/lib/hui.c src/hg/lib/hui.c index d2b18be..764e130 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -3773,37 +3773,37 @@ if (as == NULL) errAbort("Unable to get autoSql for %s", name); filterBy_t *filterByList = NULL, *filter; struct trackDbFilter *fieldFilter; while ((fieldFilter = slPopHead(&trackDbFilters)) != NULL) { if ((filter = buildFilterBy(tdb, cart, as, fieldFilter, name)) != NULL) slAddHead(&filterByList, filter); } return filterByList; } filterBy_t *filterBySetGetGuts(struct trackDb *tdb, struct cart *cart, char *name, char *subName, char *settingName) // Gets one or more "filterBy" settings (ClosestToHome). returns NULL if not found { -if (sameString(subName, "highlightBy")) - return NULL; // not supported currently - // first check to see if this tdb is using "new" FilterValues cart variables +if (differentString(subName, "highlightBy")) + { struct trackDbFilter *trackDbFilters = tdbGetTrackFilterByFilters( tdb); if (trackDbFilters) return filterByValues(tdb, cart, trackDbFilters, name); + } filterBy_t *filterBySet = NULL; char *setting = trackDbSettingClosestToHome(tdb, settingName); if(setting == NULL) return NULL; if ( name == NULL ) name = tdb->track; setting = cloneString(setting); char *filters[10]; // multiple filterBys are delimited by space but spaces inside filter can be protected "by quotes" int filterCount = chopByWhiteRespectDoubleQuotes(setting, filters, ArraySize(filters)); int ix; for (ix=0;ix