Return-Path: Delivered-To: apmail-lucene-pylucene-commits-archive@minotaur.apache.org Received: (qmail 89057 invoked from network); 10 Aug 2010 17:26:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Aug 2010 17:26:21 -0000 Received: (qmail 42574 invoked by uid 500); 10 Aug 2010 17:26:21 -0000 Delivered-To: apmail-lucene-pylucene-commits-archive@lucene.apache.org Received: (qmail 42559 invoked by uid 500); 10 Aug 2010 17:26:21 -0000 Mailing-List: contact pylucene-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: pylucene-dev@lucene.apache.org Delivered-To: mailing list pylucene-commits@lucene.apache.org Received: (qmail 42551 invoked by uid 99); 10 Aug 2010 17:26:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Aug 2010 17:26:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 10 Aug 2010 17:26:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4186923889B1; Tue, 10 Aug 2010 17:25:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r984140 - in /lucene/pylucene/branches/branch_3x: java/org/apache/pylucene/queryParser/ samples/LuceneInAction/lia/extsearch/queryparser/ test/ Date: Tue, 10 Aug 2010 17:25:02 -0000 To: pylucene-commits@lucene.apache.org From: vajda@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100810172502.4186923889B1@eris.apache.org> Author: vajda Date: Tue Aug 10 17:25:01 2010 New Revision: 984140 URL: http://svn.apache.org/viewvc?rev=984140&view=rev Log: - fixed python QueryParser test failures with some overload hackery Modified: lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonMultiFieldQueryParser.java lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonQueryParser.java lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py lucene/pylucene/branches/branch_3x/test/test_PythonQueryParser.py Modified: lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonMultiFieldQueryParser.java URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonMultiFieldQueryParser.java?rev=984140&r1=984139&r2=984140&view=diff ============================================================================== --- lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonMultiFieldQueryParser.java (original) +++ lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonMultiFieldQueryParser.java Tue Aug 10 17:25:01 2010 @@ -51,8 +51,7 @@ public class PythonMultiFieldQueryParser public native void pythonDecRef(); public native Query getBooleanQuery(List clauses, boolean disableCoord); - public native Query getFieldQuery(String field, String queryText); - public native Query getFieldQuery(String field, String queryText, int slop); + public native Query getFuzzyQuery(String field, String termText, float minSimilarity); public native Query getPrefixQuery(String field, String termText); @@ -60,4 +59,33 @@ public class PythonMultiFieldQueryParser String part1, String part2, boolean inclusive); public native Query getWildcardQuery(String field, String termText); + + public native Query getFieldQuery_quoted(String field, String queryText, + boolean quoted); + public native Query getFieldQuery_slop(String field, String queryText, + int slop); + + public Query getFieldQuery_quoted_super(String field, String queryText, + boolean quoted) + throws ParseException + { + return super.getFieldQuery(field, queryText, quoted); + } + + public Query getFieldQuery_slop_super(String field, String queryText, + int slop) + throws ParseException + { + return super.getFieldQuery(field, queryText, slop); + } + + public Query getFieldQuery(String field, String queryText, boolean quoted) + { + return getFieldQuery_quoted(field, queryText, quoted); + } + + public Query getFieldQuery(String field, String queryText, int slop) + { + return getFieldQuery_slop(field, queryText, slop); + } } Modified: lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonQueryParser.java URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonQueryParser.java?rev=984140&r1=984139&r2=984140&view=diff ============================================================================== --- lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonQueryParser.java (original) +++ lucene/pylucene/branches/branch_3x/java/org/apache/pylucene/queryParser/PythonQueryParser.java Tue Aug 10 17:25:01 2010 @@ -56,8 +56,6 @@ public class PythonQueryParser extends Q public native void pythonDecRef(); public native Query getBooleanQuery(List clauses, boolean disableCoord); - public native Query getFieldQuery(String field, String queryText); - public native Query getFieldQuery(String field, String queryText, int slop); public native Query getFuzzyQuery(String field, String termText, float minSimilarity); public native Query getPrefixQuery(String field, String termText); @@ -65,4 +63,33 @@ public class PythonQueryParser extends Q String part1, String part2, boolean inclusive); public native Query getWildcardQuery(String field, String termText); + + public native Query getFieldQuery_quoted(String field, String queryText, + boolean quoted); + public native Query getFieldQuery_slop(String field, String queryText, + int slop); + + public Query getFieldQuery_quoted_super(String field, String queryText, + boolean quoted) + throws ParseException + { + return super.getFieldQuery(field, queryText, quoted); + } + + public Query getFieldQuery_slop_super(String field, String queryText, + int slop) + throws ParseException + { + return super.getFieldQuery(field, queryText, slop); + } + + public Query getFieldQuery(String field, String queryText, boolean quoted) + { + return getFieldQuery_quoted(field, queryText, quoted); + } + + public Query getFieldQuery(String field, String queryText, int slop) + { + return getFieldQuery_slop(field, queryText, slop); + } } Modified: lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py?rev=984140&r1=984139&r2=984140&view=diff ============================================================================== --- lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py (original) +++ lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py Tue Aug 10 17:25:01 2010 @@ -58,19 +58,20 @@ class CustomQueryParser(PythonQueryParse return super(CustomQueryParser, self).getRangeQuery(field, part1, part2, inclusive) + + def getFieldQuery_quoted(self, field, queryText, quoted): + + return super(CustomQueryParser, + self).getFieldQuery_quoted_super(field, queryText, quoted) + # # Replace PhraseQuery with SpanNearQuery to force in-order # phrase matching rather than reverse. # - def getFieldQuery(self, field, queryText, slop=None): - - if slop is None: - return super(CustomQueryParser, - self).getFieldQuery(field, queryText) + def getFieldQuery_slop(self, field, queryText, slop): - # let QueryParser's implementation do the analysis orig = super(CustomQueryParser, - self).getFieldQuery(field, queryText, slop) + self).getFieldQuery_slop_super(field, queryText, slop) if not PhraseQuery.instance_(orig): return orig @@ -117,19 +118,20 @@ class MultiFieldCustomQueryParser(Python return super(CustomQueryParser, self).getRangeQuery(field, part1, part2, inclusive) + def getFieldQuery_quoted(self, field, queryText, quoted): + + return super(CustomQueryParser, + self).getFieldQuery_quoted_super(field, queryText, quoted) + # # Replace PhraseQuery with SpanNearQuery to force in-order # phrase matching rather than reverse. # - def getFieldQuery(self, field, queryText, slop=None): - - if slop is None: - return super(CustomQueryParser, - self).getFieldQuery(field, queryText) + def getFieldQuery_slop(self, field, queryText, slop): # let QueryParser's implementation do the analysis orig = super(CustomQueryParser, - self).getFieldQuery(field, queryText, slop) + self).getFieldQuery_slop_super(field, queryText, slop) if not PhraseQuery.instance_(orig): return orig Modified: lucene/pylucene/branches/branch_3x/test/test_PythonQueryParser.py URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/test/test_PythonQueryParser.py?rev=984140&r1=984139&r2=984140&view=diff ============================================================================== --- lucene/pylucene/branches/branch_3x/test/test_PythonQueryParser.py (original) +++ lucene/pylucene/branches/branch_3x/test/test_PythonQueryParser.py Tue Aug 10 17:25:01 2010 @@ -33,7 +33,8 @@ class PythonQueryParserTestCase(TestCase def testOverrideBooleanQuery(self): class TestQueryParser(BooleanTestMixin, PythonQueryParser): - pass + def getFieldQuery_quoted(_self, field, queryText, quoted): + return super(TestQueryParser, _self).getFieldQuery_quoted_super(field, queryText, quoted) qp = TestQueryParser(Version.LUCENE_CURRENT, 'all', StandardAnalyzer(Version.LUCENE_CURRENT)) @@ -46,7 +47,8 @@ class PythonMultiFieldQueryParserTestCas def testOverrideBooleanQuery(self): class TestQueryParser(BooleanTestMixin, PythonMultiFieldQueryParser): - pass + def getFieldQuery_quoted(_self, field, queryText, quoted): + return super(TestQueryParser, _self).getFieldQuery_quoted_super(field, queryText, quoted) qp = TestQueryParser(Version.LUCENE_CURRENT, ['one', 'two'], StandardAnalyzer(Version.LUCENE_CURRENT))