29792e6f4b5efdc09e3fc37b162ac1e6b356cf75 markd Mon Mar 13 11:47:34 2017 -0700 add (filter activated) to labels for mRNA and EST tracks if filters are configured diff --git src/hg/hgTracks/pubsTracks.c src/hg/hgTracks/pubsTracks.c index 1981921..ea66ee8 100644 --- src/hg/hgTracks/pubsTracks.c +++ src/hg/hgTracks/pubsTracks.c @@ -287,33 +287,31 @@ yearFilter = NULL; if(sameOk(publFilter, "all")) publFilter = NULL; if(isNotEmpty(keywords)) keywords = makeMysqlMatchStr(keywords); if (isEmpty(yearFilter) && isEmpty(keywords) && isEmpty(publFilter)) { loadGappedBed(tg); } else { // put together an "extra" query to hExtendedRangeQuery that removes articles // without the keywords specified in hgTrackUi - char *oldLabel = tg->longLabel; - tg->longLabel = catTwoStrings(oldLabel, " (filter activated)"); - freeMem(oldLabel); + labelTrackAsFiltered(tg); char **row; struct linkedFeatures *lfList = NULL; struct trackDb *tdb = tg->tdb; int scoreMin = atoi(trackDbSettingClosestToHomeOrDefault(tdb, "scoreMin", "0")); int scoreMax = atoi(trackDbSettingClosestToHomeOrDefault(tdb, "scoreMax", "1000")); boolean useItemRgb = bedItemRgb(tdb); char *extra = NULL; struct dyString *extraDy = dyStringNew(0); struct hash *articleIds = searchForKeywords(conn, articleTable, keywords); if (!sameWord(tg->table, "pubsBlat")) // new table schema: filter fields are on main bed table { if (isNotEmpty(yearFilter))