goller 2004/09/15 06:37:26
Modified: src/java/org/apache/lucene/queryParser QueryParser.jj
QueryParser.java
Log:
Throw ParseException instead of IllegalArgumentException
in case of illegal value for FuzzyQuery minimum similarity
parameter.
Revision Changes Path
1.50 +3 -0
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- QueryParser.jj 14 Sep 2004 13:45:15 -0000 1.49
+++ QueryParser.jj 15 Sep 2004 13:37:26 -0000 1.50
@@ -684,6 +684,9 @@
try {
fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue();
} catch (Exception ignored) { }
+ if(fms < 0.0f || fms > 1.0f){
+ throw new ParseException("Minimum similarity for a FuzzyQuery has
to be between 0.0f and 1.0f !");
+ }
q = getFuzzyQuery(field, termImage, fms);
} else {
q = getFieldQuery(field, termImage);
1.17 +3 -0
jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
Index: QueryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- QueryParser.java 14 Sep 2004 13:45:15 -0000 1.16
+++ QueryParser.java 15 Sep 2004 13:37:26 -0000 1.17
@@ -706,6 +706,9 @@
try {
fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue();
} catch (Exception ignored) { }
+ if(fms < 0.0f || fms > 1.0f){
+ {if (true) throw new ParseException("Minimum similarity for a FuzzyQuery
has to be between 0.0f and 1.0f !");}
+ }
q = getFuzzyQuery(field, termImage, fms);
} else {
q = getFieldQuery(field, termImage);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
