Changeset 501

Timestamp:

1999-09-01T10:47:09+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added matchmode option for some and all.

File:

• trunk/gsdl/src/colservr/queryfilter.cpp (modified) (7 diffs)

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.15  1999/08/31 22:47:09  rjmcnab
+   Added matchmode option for some and all.
+
    Revision 1.14  1999/07/16 03:42:21  sjboddie
    changed isApprox
@@ -68 +71 @@
 #include <assert.h>
 
-#define MAXDOCS 200 // note that maxdocs must be at least as large
-                    // as the highest possible value of EndResults 
+#define MAXDOCS 50000 // note that maxdocs must be at least as large
+                      // as the highest possible value of EndResults 
 
 // some useful functions
@@ -265 +268 @@
   query.querystring.clear();
   query.search_type = (filterOptions["QueryType"].defaultValue == "ranked");
+  query.match_mode = (filterOptions["MatchMode"].defaultValue == "all");
   query.casefolding = (filterOptions["Casefold"].defaultValue == "true");
   query.stemming = (filterOptions["Stem"].defaultValue == "true");
@@ -290 +294 @@
       query.querystring.clear();
       query.search_type = (filterOptions["QueryType"].defaultValue == "ranked");
+      query.match_mode = (filterOptions["MatchMode"].defaultValue == "all");
       query.casefolding = (filterOptions["Casefold"].defaultValue == "true");
       query.stemming = (filterOptions["Stem"].defaultValue == "true");
@@ -303 +308 @@
     } else if ((*options_here).name == "QueryType") {
       query.search_type = ((*options_here).value == "ranked");
+    } else if ((*options_here).name == "MatchMode") {
+      query.match_mode = ((*options_here).value == "all");
+      if (query.match_mode == 1) query.maxdocs = -1;
     } else if ((*options_here).name == "Term") {
       query.querystring = (*options_here).value;
@@ -468 +476 @@
   filterOptions["QueryType"] = filtopt;
 
+  // -- onePerQuery MatchMode      enumerated (some, all)
+  filtopt.clear();
+  filtopt.name = "MatchMode";
+  filtopt.type = FilterOption_t::enumeratedt;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
+  filtopt.defaultValue = "some";
+  filtopt.validValues.push_back("some");
+  filtopt.validValues.push_back("all");
+  filterOptions["QueryType"] = filtopt;
+
   // -- onePerTerm  Term           string ???
   filtopt.clear();
@@ -614 +632 @@
   // open the database
   gdbmptr->setlogout(&logout);
-  if (!gdbmptr->opendatabase (gdbm_filename)) {
+  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
     // most likely a system problem (we have already checked that the
     // gdbm database exists)