From 35433bc832cb3fbe7cca5f0e64f0d7d0d87914e1 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 5 Oct 2011 13:38:35 +0200 Subject: [PATCH] Remove unused pz:option_recordfilter --- src/settings.c | 1 - src/settings.h | 7 +++---- test/test_solr.urls | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/settings.c b/src/settings.c index 3455344..5d44139 100644 --- a/src/settings.c +++ b/src/settings.c @@ -75,7 +75,6 @@ static char *hard_settings[] = { "pz:preferred", /* PZ_PREFERRED */ "pz:extra_args", /* PZ_EXTRA_ARGS */ "pz:query_syntax", /* PZ_QUERY_SYNTAX */ - "pz:option_recordfilter", /* PZ_OPTION_RECORDFILTER */ "pz:facetmap:", /* PZ_FACETMAP */ "pz:limitmap:", /* PZ_LIMITMAP */ 0 diff --git a/src/settings.h b/src/settings.h index 4d1156a..aa1d023 100644 --- a/src/settings.h +++ b/src/settings.h @@ -48,10 +48,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PZ_PREFERRED 25 #define PZ_EXTRA_ARGS 26 #define PZ_QUERY_SYNTAX 27 -#define PZ_OPTION_RECORDFILTER 28 -#define PZ_FACETMAP 29 -#define PZ_LIMITMAP 30 -#define PZ_MAX_EOF 31 +#define PZ_FACETMAP 28 +#define PZ_LIMITMAP 29 +#define PZ_MAX_EOF 30 struct setting { diff --git a/test/test_solr.urls b/test/test_solr.urls index 1ce919e..3daef61 100644 --- a/test/test_solr.urls +++ b/test/test_solr.urls @@ -1,5 +1,5 @@ http://localhost:9763/search.pz2?command=init&clear=1 -http://localhost:9763/search.pz2?session=1&command=settings&pz%3Atermlist_term_count%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=ocs_test&pz%3Acclmap%3Aissn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&pz%3Aoption_recordfilter%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=remote +http://localhost:9763/search.pz2?session=1&command=settings&pz%3Atermlist_term_count%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=ocs_test&pz%3Acclmap%3Aissn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=UTF-8 http://localhost:9763/search.pz2?session=1&command=search&query=water 1 http://localhost:9763/search.pz2?session=1&command=show&block=preferred http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium -- 1.7.10.4