Changeset 12410

Timestamp:

2006-08-07T16:10:16+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added support for the new "-filter" option to lucene_query.pl (used by us for date filtering). Many thanks to Me and DL Consulting Ltd.

Location:

trunk/gsdl/src

Files:

• colservr/lucenesearch.cpp (modified) (1 diff)
• colservr/queryfilter.cpp (modified) (3 diffs)
• colservr/queryinfo.cpp (modified) (4 diffs)
• colservr/queryinfo.h (modified) (1 diff)
• recpt/querytools.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -121 +121 @@
   text_t cmd = "\"" + filename_cat(gsdlhome, "bin", "script", "lucene_query.pl") + "\"";
   cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 
+
+  if (!queryparams.filterstring.empty()) {
+    cmd += " -filter \"" + queryparams.filterstring + "\"";
+  }
   if (!queryparams.sortfield.empty()) {
     cmd += " -sort \"" + queryparams.sortfield + "\"";

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -90 +90 @@
   query.maxdocs = filterOptions["Maxdocs"].defaultValue.getint();
   query.level = filterOptions["Level"].defaultValue;
-  // Lucene specific
-  query.sortfield = filterOptions["SortField"].defaultValue;
-  query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");
+  query.filterstring = filterOptions["FilterString"].defaultValue;  // Lucene specific
+  query.sortfield = filterOptions["SortField"].defaultValue;  // Lucene specific
+  query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");  // Lucene specific
   query.maxnumeric = maxnumeric;
   OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
@@ -119 +119 @@
       query.stemming = (filterOptions["Stem"].defaultValue == "true");
       query.level = filterOptions["Level"].defaultValue;
-      // Lucene specific
-      query.sortfield = filterOptions["SortField"].defaultValue;
-      query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");
+      query.filterstring = filterOptions["FilterString"].defaultValue;  // Lucene specific
+      query.sortfield = filterOptions["SortField"].defaultValue;  // Lucene specific
+      query.fuzzysearch = (filterOptions["FuzzySearch"].defaultValue == "true");  // Lucene specific
       query.maxnumeric = maxnumeric;
       // "all", needed when combining queries where the document results are needed
@@ -154 +154 @@
     } else if ((*options_here).name == "Level") {
       query.level = (*options_here).value;
+    } else if ((*options_here).name == "FilterString") {
+      query.filterstring = (*options_here).value;
     } else if ((*options_here).name == "SortField") {
       query.sortfield = (*options_here).value;

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -47 +47 @@
   maxdocs = -1;    // all
   maxnumeric = 4;  // must default to the same value as mg_passes
+  filterstring.clear();
   sortfield.clear();
   fuzzysearch = 0; // 0 = not fuzzy, 1 = fuzzy
@@ -66 +67 @@
   maxdocs = q.maxdocs;
   maxnumeric = q.maxnumeric;
+  filterstring = q.filterstring;
   sortfield = q.sortfield;
   fuzzysearch = q.fuzzysearch;
@@ -86 +88 @@
       (x.maxdocs == y.maxdocs) &&
       (x.maxnumeric == y.maxnumeric) &&
+      (x.filterstring == y.filterstring) &&
           (x.sortfield == y.sortfield) &&
           (x.fuzzysearch == y.fuzzysearch));
@@ -112 +115 @@
   outs << " maxdocs = \"" << q.maxdocs << "\"\n";
   outs << " maxnumeric = \"" << q.maxnumeric << "\"\n";
+  outs << " filterstring = \"" << q.filterstring << "\"\n";
   outs << " sortfield = \"" << q.sortfield << "\"\n";
   outs << " fuzzysearch = \"" << q.fuzzysearch << "\"\n";

trunk/gsdl/src/colservr/queryinfo.h

@@ -66 +66 @@
   int maxdocs;
   int maxnumeric;
+  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)

trunk/gsdl/src/recpt/querytools.cpp

@@ -138 +138 @@
     option.name = "Level";
     option.value = args["g"];
+    request.filterOptions.push_back (option);
+  }
+
+  if (!args["fs"].empty()) { // filter string for lucene
+    option.name = "FilterString";
+    option.value = args["fs"];
     request.filterOptions.push_back (option);
   }