0a456bff8d6200e3bda8bc9f73cfd5d75f135f73 max Tue Apr 30 15:23:37 2013 -0700 filters work on main table now if table is in new format, added publisher filter diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index cb41e4c..7fe3217 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -1987,34 +1987,34 @@ puts("<P><B>Title: </B>"); cgiMakeTextVar(titleVar, title, 30); puts("<P><B>Display: </B>"); cgiMakeCheckBox(BASE_SHOWASM, showAsm); puts(" <B>assembly </B>"); cgiMakeCheckBox(BASE_SHOWPOS, showPos); puts(" <B>position</B>"); } void pubsUi(struct trackDb *tdb) /* UI for pubs match track */ { #define NUM_YEARS 15 // similar to google scholar, which goes back to 20 years -#define PUBS_KEYWORDS_TAG "pubsKeywords" -#define PUBS_YEAR_TAG "pubsYear" +#define PUBS_KEYWORDS_TAG "pubsFilterKeywords" +#define PUBS_YEAR_TAG "pubsFilterYear" #define PUBS_COLORBY_TAG "pubsColorBy" -#define PUBS_PUBFILT_TAG "pubsPublisher" +#define PUBS_PUBFILT_TAG "pubsFilterPublisher" // get current set filters from cart char *keywords = cartUsualStringClosestToHome(cart, tdb, FALSE, PUBS_KEYWORDS_TAG, ""); char *yearFilter = cartUsualStringClosestToHome(cart, tdb, FALSE, PUBS_YEAR_TAG, "anytime"); char *colorBy = cartUsualStringClosestToHome(cart, tdb, FALSE, PUBS_COLORBY_TAG, "topic"); char *pubFilter = cartUsualStringClosestToHome(cart, tdb, FALSE, PUBS_PUBFILT_TAG, "all"); // print keyword input box puts("<P><B>Filter articles by keywords in abstract, title or authors:</B>"); char cgiVar[128]; safef(cgiVar,sizeof(cgiVar),"%s.%s",tdb->track,PUBS_KEYWORDS_TAG); cgiMakeTextVar(cgiVar, keywords, 45); // generate strings like "since <year>" for last 15 years char *text[NUM_YEARS + 1];