Author: ehatcher
Date: Mon Mar 7 12:18:58 2005
New Revision: 156443
URL: http://svn.apache.org/viewcvs?view=rev&rev=156443
Log:
JavaCC generate the changes Doug has made
Modified:
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
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/QueryParserTokenManager.java
URL:
http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java?view=diff&r1=156442&r2=156443
==============================================================================
---
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
(original)
+++
lucene/java/trunk/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
Mon Mar 7 12:18:58 2005
@@ -8,6 +8,7 @@
import org.apache.lucene.analysis.*;
import org.apache.lucene.document.*;
import org.apache.lucene.search.*;
+import org.apache.lucene.util.Parameter;
public class QueryParserTokenManager implements QueryParserConstants
{
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=156442&r2=156443
==============================================================================
---
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 12:18:58 2005
@@ -429,10 +429,30 @@
*/
protected Query getBooleanQuery(Vector clauses) throws ParseException
{
+ return 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));
}
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=156442&r2=156443
==============================================================================
---
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 12:18:58 2005
@@ -451,8 +451,10 @@
* @exception ParseException throw in overridden method to disallow
*/
protected Query getBooleanQuery(Vector clauses) throws ParseException
- getBooleanQuery(clauses, false);
+ {
+ return getBooleanQuery(clauses, false);
}
+
/**
* Factory method for generating query, given a set of clauses.
* By default creates a boolean query composed of clauses passed in.
