Changeset 12314

Timestamp:

2006-07-28T11:40:29+12:00 (18 years ago)

Author:

kjdon

Message:

maxnumeric moved from mgqueryfilterclass to queryfilterclass, cos now mgpp uses it too. Its passed in as an arg to ParseQuery

Location:

trunk/gsdl/src/colservr

Files:

• mgppsearch.cpp (modified) (1 diff)
• mgqueryfilter.cpp (modified) (3 diffs)
• mgqueryfilter.h (modified) (1 diff)
• queryfilter.cpp (modified) (4 diffs)
• queryfilter.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -148 +148 @@
   // create the mgpp query tree
   QueryNode *queryTree = NULL;
-  queryTree = ParseQuery(queryArray, defaultBoolCombine, defaultStemMethod);
+  queryTree = ParseQuery(queryArray, defaultBoolCombine, defaultStemMethod, queryparams.maxnumeric);
   if (queryTree == NULL) { // syntax error
     queryresult.syntax_error = true;

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -90 +90 @@
   queryfilterclass::configure (key, cfgline);
 
-  if (key == "maxnumeric") {
-    maxnumeric = cfgline[0].getint();
-  }
-  else if (key == "indexstem") {
+  if (key == "indexstem") {
     ((mgsearchclass *)textsearchptr)->set_indexstem (cfgline[0]);
   }
@@ -288 +285 @@
 
   num_phrases = 0;
-  maxnumeric = 4;
 }
 
@@ -464 +460 @@
   while (query_here != query_end) {
 
-    // set maxnumeric
-    (*query_here).maxnumeric = maxnumeric;
-
     // if we're doing a phrase search we want to maximise hits by making it
     // a boolean search on the index with the finest granularity - we'll

trunk/gsdl/src/colservr/mgqueryfilter.h

@@ -51 +51 @@
   int num_phrases;
 
-  int maxnumeric;
-
   void get_phrase_terms (const text_t &querystring, 
              const termfreqclassarray &orgterms,

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -91 +91 @@
   query.level = filterOptions["Level"].defaultValue;
   query.sortfield = filterOptions["SortField"].defaultValue;
+  query.maxnumeric = maxnumeric;
   OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
   OptionValue_tarray::const_iterator options_end = request.filterOptions.end();
@@ -117 +118 @@
       query.level = filterOptions["Level"].defaultValue;
       query.sortfield = filterOptions["SortField"].defaultValue;
+      query.maxnumeric = maxnumeric;
       // "all", needed when combining queries where the document results are needed
       if (need_matching_docs (request.filterResultOptions)) query.maxdocs = -1; 
@@ -170 +172 @@
   gdbmptr = NULL;
   textsearchptr = NULL;
+  maxnumeric = 4;
 
   FilterOption_t filtopt;
@@ -337 +340 @@
   } else if (key == "indexstem") {
     indexstem = cfgline[0];
-  }
+  } else if (key == "maxnumeric") {
+    maxnumeric = cfgline[0].getint();
+  }
+  
 }
 

trunk/gsdl/src/colservr/queryfilter.h

@@ -53 +53 @@
   
   searchclass *textsearchptr;
-  
+
+  int maxnumeric;
+
    // get the query parameters
   void parse_query_params (const FilterRequest_t &request,