You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by eh...@apache.org on 2005/03/07 22:56:38 UTC

svn commit: r156451 - lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj

Author: ehatcher
Date: Mon Mar  7 13:56:36 2005
New Revision: 156451

URL: http://svn.apache.org/viewcvs?view=rev&rev=156451
Log:
fix the +/-a queries - easier than I thought - just restored a line of code from QueryParser.jj

Modified:
    lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
    lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj

Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java?view=diff&r1=156450&r2=156451
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java Mon Mar  7 13:56:36 2005
@@ -663,7 +663,8 @@
     modifier = Modifier();
     q = andExpression(field);
     addClause(clauses, CONJ_NONE, modifier, q);
-    firstQuery=q;
+    if (modifier == MOD_NONE)
+      firstQuery=q;
     label_1:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {

Modified: lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj?view=diff&r1=156450&r2=156451
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj Mon Mar  7 13:56:36 2005
@@ -722,7 +722,8 @@
   modifier=Modifier() q=andExpression(field)
   {
     addClause(clauses, CONJ_NONE, modifier, q);
-    firstQuery=q;
+    if (modifier == MOD_NONE)
+      firstQuery=q;
   }
   (
     [<OR> { orPresent=true; }] modifier=Modifier() q=andExpression(field)