Changeset 12770 for trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

Timestamp:

2006-09-18T14:32:31+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed the Lucene "-fuzzy" argument to "-fuzziness <value>", for more accurate control.

File:

• trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (8 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

@@ -44 +44 @@
     {
     if (args.length == 0) {
-        System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzzy] [-filter filter_string] [-sort sort_field] [-dco AND|OR] [-startresults number -endresults number]");
+        System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzziness value] [-filter filter_string] [-sort sort_field] [-dco AND|OR] [-startresults number -endresults number]");
         return;
     }
@@ -58 +58 @@
         Sort sorter = new Sort();
         Filter filter = null;
-            boolean fuzzy = false;
+        String fuzziness = null;
 
         // Paging
@@ -86 +86 @@
                             default_conjuction_operator = args[i];
                         }
-                    if (args[i].equals("-fuzzy"))
+                    if (args[i].equals("-fuzziness"))
                         {
-                            fuzzy = true;
+                i++;
+                fuzziness = args[i];
                         }
             if (args[i].equals("-startresults"))
@@ -133 +134 @@
             query_including_stop_words = query_including_stop_words.rewrite(reader);
 
-            Query query = parseQuery(reader, query_parser, query_string, fuzzy);
+            Query query = parseQuery(reader, query_parser, query_string, fuzziness);
             query = query.rewrite(reader);
 
@@ -271 +272 @@
 
 
-    private static Query parseQuery(IndexReader reader, QueryParser query_parser, String query_string, boolean fuzzy)
+    private static Query parseQuery(IndexReader reader, QueryParser query_parser, String query_string, String fuzziness)
     throws java.io.IOException, org.apache.lucene.queryParser.ParseException
     {
@@ -304 +305 @@
     // If this is a fuzzy search, then we need to add the fuzzy
     // flag to each of the query terms
-    if (fuzzy && query.toString().length() > 0)
+    if (fuzziness != null && query.toString().length() > 0)
         {
         // Revert the query to a string
@@ -363 +364 @@
                     {
                     ///ystem.err.println("Yahoo! Found fuzzy term.");
-                    mutable_query_string.insert(o, '~');
+                    mutable_query_string.insert(o, '~' + fuzziness);
                     o++;
                     s = 0; // Reset
@@ -374 +375 @@
         if (s == 3)
             {
-            mutable_query_string.append('~');
+            mutable_query_string.append('~' + fuzziness);
             }
         // Reparse the query