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

[cutting]

Author: cutting
Date: Mon Mar  7 11:53:29 2005
New Revision: 156441

URL: http://svn.apache.org/viewcvs?view=rev&rev=156441
Log:
Amendment to patch #33472.  Extended to Erik's new query parser, and patched 
one place missed in the original patch.

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

Modified: 
lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
URL: 
http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java?view=diff&r1=156440&r2=156441
==============================================================================
--- 
lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
 (original)
+++ 
lucene/java/trunk/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
 Mon Mar  7 11:53:29 2005
@@ -75,7 +75,7 @@
       for (int i = 0; i < fields.length; i++)
         clauses.add(new BooleanClause(super.getFieldQuery(fields[i], 
queryText),
             BooleanClause.Occur.SHOULD));
-      return getBooleanQuery(clauses);
+      return getBooleanQuery(clauses, true);
     }
     return super.getFieldQuery(field, queryText);
   }

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=156440&r2=156441
==============================================================================
--- 
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 11:53:29 2005
@@ -451,11 +451,29 @@
    * @exception ParseException throw in overridden method to disallow
    */
   protected Query getBooleanQuery(Vector clauses) throws ParseException
+    getBooleanQuery(clauses, false);
+  }
+  /**
+   * Factory method for generating query, given a set of clauses.
+   * By default creates a boolean query composed of clauses passed in.
+   *
+   * Can be overridden by extending classes, to modify query being
+   * returned.
+   *
+   * @param clauses Vector that contains [EMAIL PROTECTED] BooleanClause} 
instances
+   *    to join.
+   * @param disableCoord true if coord scoring should be disabled.
+   *
+   * @return Resulting [EMAIL PROTECTED] Query} object.
+   * @exception ParseException throw in overridden method to disallow
+   */
+  protected Query getBooleanQuery(Vector clauses, boolean disableCoord)
+    throws ParseException
   {
     if (clauses == null || clauses.size() == 0)
       return null;
 
-    BooleanQuery query = new BooleanQuery();
+    BooleanQuery query = new BooleanQuery(disableCoord);
     for (int i = 0; i < clauses.size(); i++) {
       query.add((BooleanClause)clauses.elementAt(i));
     }