Author: ehatcher
Date: Tue Mar 8 18:59:40 2005
New Revision: 156597
URL: http://svn.apache.org/viewcvs?view=rev&rev=156597
Log:
Minor tweaks to the new proposed query parser. There are still some
failing tests, as some were added to show expectations not yet met. The
main missing piece is getting NOT precedence accounted for.
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=156596&r2=156597
==============================================================================
---
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
Tue Mar 8 18:59:40 2005
@@ -86,15 +86,15 @@
}
/** Parses a query string, returning a [EMAIL PROTECTED]
org.apache.lucene.search.Query}.
- * @param query the query string to be parsed.
+ * @param expression the query expression to be parsed.
* @param field the default field for query terms.
* @param analyzer used to find terms in the query text.
* @throws ParseException if the parsing fails
*/
- static public Query parse(String query, String field, Analyzer analyzer)
+ static public Query parse(String expression, String field, Analyzer analyzer)
throws ParseException {
PrecedenceQueryParser parser = new PrecedenceQueryParser(field, analyzer);
- return parser.parse(query);
+ return parser.parse(expression);
}
/** Constructs a query parser.
@@ -108,10 +108,15 @@
}
/** Parses a query string, returning a [EMAIL PROTECTED]
org.apache.lucene.search.Query}.
- * @param query the query string to be parsed.
+ * @param expression the query string to be parsed.
* @throws ParseException if the parsing fails
*/
public Query parse(String expression) throws ParseException {
+ // optimize empty query to be empty BooleanQuery
+ if (expression == null || expression.trim().length() == 0) {
+ return new BooleanQuery();
+ }
+
ReInit(new FastCharStream(new StringReader(expression)));
try {
Query query = Query(field);
@@ -657,14 +662,14 @@
final public Query Query(String field) throws ParseException {
Vector clauses = new Vector();
- int modifier;
Query q, firstQuery=null;
boolean orPresent = false;
+ int modifier;
modifier = Modifier();
q = andExpression(field);
addClause(clauses, CONJ_NONE, modifier, q);
if (modifier == MOD_NONE)
- firstQuery=q;
+ firstQuery = q;
label_1:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -707,39 +712,13 @@
throw new Error("Missing return statement in function");
}
-/*
-Query orExpression(String field) :
-{
- Vector clauses = new Vector();
- Query q, firstQuery=null;
- int modifier;
-}
-{
- q=andExpression(field)
- {
- addClause(clauses, CONJ_NONE, MOD_NONE, q);
- firstQuery=q;
- }
- (
- <OR> modifier=Modifier() q=andExpression(field)
- { addClause(clauses, CONJ_OR, modifier, q); }
- )*
- {
- if (clauses.size() == 1 && firstQuery != null)
- return firstQuery;
- else {
- return getBooleanQuery(clauses);
- }
- }
-}
-*/
final public Query andExpression(String field) throws ParseException {
Vector clauses = new Vector();
Query q, firstQuery=null;
int modifier;
q = Clause(field);
addClause(clauses, CONJ_NONE, MOD_NONE, q);
- firstQuery=q;
+ firstQuery = q;
label_2:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -818,7 +797,6 @@
boolean prefix = false;
boolean wildcard = false;
boolean fuzzy = false;
- boolean rangein = false;
Query q;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TERM:
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=156596&r2=156597
==============================================================================
---
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
Tue Mar 8 18:59:40 2005
@@ -109,15 +109,15 @@
}
/** Parses a query string, returning a [EMAIL PROTECTED]
org.apache.lucene.search.Query}.
- * @param query the query string to be parsed.
+ * @param expression the query expression to be parsed.
* @param field the default field for query terms.
* @param analyzer used to find terms in the query text.
* @throws ParseException if the parsing fails
*/
- static public Query parse(String query, String field, Analyzer analyzer)
+ static public Query parse(String expression, String field, Analyzer analyzer)
throws ParseException {
PrecedenceQueryParser parser = new PrecedenceQueryParser(field, analyzer);
- return parser.parse(query);
+ return parser.parse(expression);
}
/** Constructs a query parser.
@@ -131,10 +131,15 @@
}
/** Parses a query string, returning a [EMAIL PROTECTED]
org.apache.lucene.search.Query}.
- * @param query the query string to be parsed.
+ * @param expression the query string to be parsed.
* @throws ParseException if the parsing fails
*/
public Query parse(String expression) throws ParseException {
+ // optimize empty query to be empty BooleanQuery
+ if (expression == null || expression.trim().length() == 0) {
+ return new BooleanQuery();
+ }
+
ReInit(new FastCharStream(new StringReader(expression)));
try {
Query query = Query(field);
@@ -714,16 +719,16 @@
Query Query(String field) :
{
Vector clauses = new Vector();
- int modifier;
Query q, firstQuery=null;
boolean orPresent = false;
+ int modifier;
}
{
modifier=Modifier() q=andExpression(field)
{
addClause(clauses, CONJ_NONE, modifier, q);
if (modifier == MOD_NONE)
- firstQuery=q;
+ firstQuery = q;
}
(
[<OR> { orPresent=true; }] modifier=Modifier() q=andExpression(field)
@@ -738,33 +743,6 @@
}
}
-/*
-Query orExpression(String field) :
-{
- Vector clauses = new Vector();
- Query q, firstQuery=null;
- int modifier;
-}
-{
- q=andExpression(field)
- {
- addClause(clauses, CONJ_NONE, MOD_NONE, q);
- firstQuery=q;
- }
- (
- <OR> modifier=Modifier() q=andExpression(field)
- { addClause(clauses, CONJ_OR, modifier, q); }
- )*
- {
- if (clauses.size() == 1 && firstQuery != null)
- return firstQuery;
- else {
- return getBooleanQuery(clauses);
- }
- }
-}
-*/
-
Query andExpression(String field) :
{
Vector clauses = new Vector();
@@ -775,7 +753,7 @@
q=Clause(field)
{
addClause(clauses, CONJ_NONE, MOD_NONE, q);
- firstQuery=q;
+ firstQuery = q;
}
(
<AND> modifier=Modifier() q=Clause(field)
@@ -825,7 +803,6 @@
boolean prefix = false;
boolean wildcard = false;
boolean fuzzy = false;
- boolean rangein = false;
Query q;
}
{
