Changeset 12770 for trunk/gsdl/src/colservr

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.

Location:

trunk/gsdl/src/colservr

Files:

• lucenesearch.cpp (modified) (1 diff)
• queryfilter.cpp (modified) (3 diffs)
• queryinfo.cpp (modified) (4 diffs)
• queryinfo.h (modified) (1 diff)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -123 +123 @@
     cmd += " -sort \"" + queryparams.sortfield + "\"";
   }
-  if (queryparams.fuzzysearch)
-    {
-      cmd += " -fuzzy";
-    }
+  if (!queryparams.fuzziness.empty()) {
+    cmd += " -fuzziness " + queryparams.fuzziness;
+  }
 
   // New code to support configuration of the default conjuction operator

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -92 +92 @@
   query.filterstring = filterOptions["FilterString"].defaultValue;  // Lucene specific
   query.sortfield = filterOptions["SortField"].defaultValue;  // Lucene specific
-  query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");  // Lucene specific
+  query.fuzziness = filterOptions["Fuzziness"].defaultValue;  // Lucene specific
   query.maxnumeric = maxnumeric;
   OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
@@ -121 +121 @@
       query.filterstring = filterOptions["FilterString"].defaultValue;  // Lucene specific
       query.sortfield = filterOptions["SortField"].defaultValue;  // Lucene specific
-      query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");  // Lucene specific
+      query.fuzziness = filterOptions["Fuzziness"].defaultValue;  // Lucene specific
       query.maxnumeric = maxnumeric;
       // "all", needed when combining queries where the document results are needed
@@ -158 +158 @@
     } else if ((*options_here).name == "SortField") {
       query.sortfield = (*options_here).value;
-    } else if ((*options_here).name == "FuzzySearch") {
-      query.fuzzysearch = ((*options_here).value == "true");
+    } else if ((*options_here).name == "Fuzziness") {
+      query.fuzziness = (*options_here).value;
     } else {
       logout << text_t2ascii

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -49 +49 @@
   filterstring.clear();
   sortfield.clear();
-  fuzzysearch = 0; // 0 = not fuzzy, 1 = fuzzy
+  fuzziness.clear();
   startresults = 1; // all
   endresults = 10; // all
@@ -71 +71 @@
   filterstring = q.filterstring;
   sortfield = q.sortfield;
-  fuzzysearch = q.fuzzysearch;
+  fuzziness = q.fuzziness;
   startresults = q.startresults;
   endresults = q.endresults;
@@ -94 +94 @@
       (x.filterstring == y.filterstring) &&
           (x.sortfield == y.sortfield) &&
-          (x.fuzzysearch == y.fuzzysearch) &&
+          (x.fuzziness == y.fuzziness) &&
           (x.startresults == y.startresults) &&
           (x.startresults == y.startresults));
@@ -123 +123 @@
   outs << " filterstring = \"" << q.filterstring << "\"\n";
   outs << " sortfield = \"" << q.sortfield << "\"\n";
-  outs << " fuzzysearch = \"" << q.fuzzysearch << "\"\n";
+  outs << " fuzziness = \"" << q.fuzziness << "\"\n";
   outs << " startresults = \"" << q.startresults << "\"\n";
   outs << " endresults = \"" << q.endresults << "\"\n";

trunk/gsdl/src/colservr/queryinfo.h

@@ -68 +68 @@
   text_t filterstring; // Filter specified (currently only used by Lucene)
   text_t sortfield; // Field to use for sorting result set (currently used by lucene)
-  int fuzzysearch; // Should search be fuzzy (only used by Lucene)
+  text_t fuzziness; // Search fuzziness amount between 0.0 and 1.0 (only used by Lucene)
 
   int startresults;