Changeset 613

Timestamp:

1999-09-22T00:01:07+12:00 (25 years ago)

Author:

sjboddie

Message:

added Maxdocs queryfilter option (which may be -1 for 'all')

File:

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

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.17  1999/09/21 12:01:07  sjboddie
+   added Maxdocs queryfilter option (which may be -1 for 'all')
+
    Revision 1.16  1999/09/07 04:57:24  sjboddie
    added gpl notice
@@ -90 +93 @@
 #include <assert.h>
 
-#define MAXDOCS 200 // note that maxdocs must be at least as large
-                    // as the highest possible value of EndResults 
 
 // some useful functions
@@ -290 +291 @@
   query.casefolding = (filterOptions["Casefold"].defaultValue == "true");
   query.stemming = (filterOptions["Stem"].defaultValue == "true");
-  query.maxdocs = MAXDOCS; // default for single query
+  query.maxdocs = filterOptions["Maxdocs"].defaultValue.getint();
 
   OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
@@ -319 +320 @@
       // "all", needed when combining queries where the document results are needed
       if (need_matching_docs (request.filterResultOptions)) query.maxdocs = -1; 
-      else query.maxdocs = MAXDOCS; // "all"
+      else query.maxdocs = filterOptions["Maxdocs"].defaultValue.getint();
       
     } else if ((*options_here).name == "StartResults") {
@@ -342 +343 @@
     } else if ((*options_here).name == "Language") {
       query.language = (*options_here).value;
+    } else if ((*options_here).name == "Maxdocs") {
+      query.maxdocs = (*options_here).value.getint();
     } else {
       logout << text_t2ascii
@@ -503 +506 @@
   filtopt.validValues.push_back("some");
   filtopt.validValues.push_back("all");
-  filterOptions["QueryType"] = filtopt;
+  filterOptions["MatchMode"] = filtopt;
 
   // -- onePerTerm  Term           string ???
@@ -556 +559 @@
   filtopt.defaultValue = "";
   filterOptions["Language"] = filtopt;
+
+  // -- onePerQuery  Maxdocs  integer
+  filtopt.clear();
+  filtopt.name = "Maxdocs";
+  filtopt.type = FilterOption_t::integert;
+  filtopt.repeatable = FilterOption_t::onePerQuery;
+  filtopt.defaultValue = "200";
+  filtopt.validValues.push_back("-1");
+  filtopt.validValues.push_back("1000");
+  filterOptions["Maxdocs"] = filtopt;
 }