otis 2004/03/24 02:12:27
Modified: . CHANGES.txt
src/java/org/apache/lucene/queryParser QueryParser.jj
QueryParserTokenManager.java
Log:
- Changed QueryParser.jj to allow '-' and '+' characters in search terms.
Morus Walter's patch: http://issues.apache.org/bugzilla/show_bug.cgi?id=27491
Revision Changes Path
1.77 +5 -1 jakarta-lucene/CHANGES.txt
Index: CHANGES.txt
===================================================================
RCS file: /home/cvs/jakarta-lucene/CHANGES.txt,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- CHANGES.txt 18 Mar 2004 19:05:18 -0000 1.76
+++ CHANGES.txt 24 Mar 2004 10:12:27 -0000 1.77
@@ -71,6 +71,10 @@
- default write lock timeout
(Otis)
+13. Changed QueryParser.jj to allow '-' and '+' within tokens:
+ http://issues.apache.org/bugzilla/show_bug.cgi?id=27491
+ (Morus Walter via Otis)
+
1.3 final
1.42 +1 -1
jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
Index: QueryParser.jj
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- QueryParser.jj 3 Mar 2004 12:07:13 -0000 1.41
+++ QueryParser.jj 24 Mar 2004 10:12:27 -0000 1.42
@@ -446,7 +446,7 @@
| <#_TERM_START_CHAR: ( ~[ " ", "\t", "\n", "\r", "+", "-", "!", "(", ")", ":", "^",
"[", "]", "\"", "{", "}", "~", "*", "?" ]
| <_ESCAPED_CHAR> ) >
-| <#_TERM_CHAR: ( <_TERM_START_CHAR> | <_ESCAPED_CHAR> ) >
+| <#_TERM_CHAR: ( <_TERM_START_CHAR> | <_ESCAPED_CHAR> | "-" | "+" ) >
| <#_WHITESPACE: ( " " | "\t" | "\n" | "\r") >
}
1.3 +3 -3
jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
Index: QueryParserTokenManager.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QueryParserTokenManager.java 3 Mar 2004 12:07:13 -0000 1.2
+++ QueryParserTokenManager.java 24 Mar 2004 10:12:27 -0000 1.3
@@ -181,7 +181,7 @@
jjCheckNAddStates(0, 6);
break;
case 20:
- if ((0x7bffd0f8ffffd9ffL & l) == 0L)
+ if ((0x7bfff8f8ffffd9ffL & l) == 0L)
break;
if (kind > 17)
kind = 17;
@@ -195,7 +195,7 @@
jjCheckNAddTwoStates(20, 21);
break;
case 23:
- if ((0x7bffd0f8ffffd9ffL & l) != 0L)
+ if ((0x7bfff8f8ffffd9ffL & l) != 0L)
jjCheckNAddStates(7, 9);
break;
case 24:
@@ -207,7 +207,7 @@
jjCheckNAddStates(7, 9);
break;
case 27:
- if ((0xfbffd4f8ffffd9ffL & l) == 0L)
+ if ((0xfbfffcf8ffffd9ffL & l) == 0L)
break;
if (kind > 21)
kind = 21;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
