Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B6F3DC16 for ; Tue, 28 May 2013 23:53:41 +0000 (UTC) Received: (qmail 39157 invoked by uid 500); 28 May 2013 23:53:41 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 39142 invoked by uid 99); 28 May 2013 23:53:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 23:53:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 23:53:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA86423888E7; Tue, 28 May 2013 23:53:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487171 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/ lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucene/code... Date: Tue, 28 May 2013 23:53:16 -0000 To: commits@lucene.apache.org From: hossman@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130528235316.BA86423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hossman Date: Tue May 28 23:53:15 2013 New Revision: 1487171 URL: http://svn.apache.org/r1487171 Log: additional examples of the switch parser inspired by a recent email thread (merge r1487166) Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/dev-tools/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed) lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed) lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed) lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/lucene/README.txt (props changed) lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/branches/branch_4x/lucene/analysis/ (props changed) lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed) lucene/dev/branches/branch_4x/lucene/backwards/ (props changed) lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed) lucene/dev/branches/branch_4x/lucene/build.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/ (props changed) lucene/dev/branches/branch_4x/lucene/classification/build.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/ivy.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/src/ (props changed) lucene/dev/branches/branch_4x/lucene/codecs/ (props changed) lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/core/ (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed) lucene/dev/branches/branch_4x/lucene/demo/ (props changed) lucene/dev/branches/branch_4x/lucene/facet/ (props changed) lucene/dev/branches/branch_4x/lucene/grouping/ (props changed) lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed) lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed) lucene/dev/branches/branch_4x/lucene/join/ (props changed) lucene/dev/branches/branch_4x/lucene/licenses/ (props changed) lucene/dev/branches/branch_4x/lucene/memory/ (props changed) lucene/dev/branches/branch_4x/lucene/misc/ (props changed) lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/queries/ (props changed) lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed) lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed) lucene/dev/branches/branch_4x/lucene/replicator/ (props changed) lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed) lucene/dev/branches/branch_4x/lucene/site/ (props changed) lucene/dev/branches/branch_4x/lucene/spatial/ (props changed) lucene/dev/branches/branch_4x/lucene/suggest/ (props changed) lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed) lucene/dev/branches/branch_4x/lucene/tools/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed) lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/README.txt (props changed) lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/branches/branch_4x/solr/build.xml (props changed) lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed) lucene/dev/branches/branch_4x/solr/common-build.xml (props changed) lucene/dev/branches/branch_4x/solr/contrib/ (props changed) lucene/dev/branches/branch_4x/solr/core/ (props changed) lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed) lucene/dev/branches/branch_4x/solr/example/ (props changed) lucene/dev/branches/branch_4x/solr/licenses/ (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/scripts/ (props changed) lucene/dev/branches/branch_4x/solr/site/ (props changed) lucene/dev/branches/branch_4x/solr/solrj/ (props changed) lucene/dev/branches/branch_4x/solr/test-framework/ (props changed) lucene/dev/branches/branch_4x/solr/webapp/ (props changed) Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java?rev=1487171&r1=1487170&r2=1487171&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java (original) +++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java Tue May 28 23:53:15 2013 @@ -82,6 +82,57 @@ import org.apache.commons.lang.StringUti * v=$shipping}</str> * </lst> * </requestHandler> + * + *

+ * A slightly more interesting variant of the shipping example above, would be + * to combine the switch parser with the frange parser, to allow the client to specify an + * arbitrary "max shipping" amount that will be used to build a filter if and only if a + * value is specified. Example: + *

+ * 
+ * <requestHandler name="/select" class="solr.SearchHandler">
+ *   <lst name="invariants">
+ *     <str name="shipping_fq">{!frange u=$shipping}shipping_cost</str>
+ *   </lst>
+ *   <lst name="defaults">
+ *     <str name="shipping">any</str>
+ *   </lst>
+ *   <lst name="appends">
+ *     <str name="fq">{!switch case='*:*'
+ *                             case.any='*:*'
+ *                             default=$shipping_fq
+ *                             v=$shipping}</str>
+ *   </lst>
+ * </requestHandler>
+ * + *

+ * With the above configuration a client that specifies shipping=any, or + * does not specify a shipping param at all, will not have the results + * filtered. But if a client specifies a numeric value (ie: shipping=10, + * shipping=5, etc..) then the results will be limited to documents whose + * shipping_cost field has a value less then that number. + *

+ * + *

+ * A similar use case would be to combine the switch parser with the bbox parser to + * support an optional geographic filter that is applied if and only if the client + * specifies a location param containing a lat,lon pair to be used as + * the center of the bounding box: + *

+ * 
+ * <requestHandler name="/select" class="solr.SearchHandler">
+ *   <lst name="invariants">
+ *     <str name="bbox_fq">{!bbox pt=$location sfield=geo d=$dist}</str>
+ *   </lst>
+ *   <lst name="defaults">
+ *     <str name="dist">100</str>
+ *   </lst>
+ *   <lst name="appends">
+ *     <str name="fq">{!switch case='*:*' 
+ *                             default=$bbox_fq 
+ *                             v=$location}</str>
+ *   </lst>
+ * </requestHandler>
*/ public class SwitchQParserPlugin extends QParserPlugin { public static String NAME = "switch";