Changeset 4193

Timestamp:

2003-04-18T14:25:00+12:00 (21 years ago)

Author:

sjboddie

Message:

Added runtime support for the new maxnumeric build time option.

Location:

trunk/gsdl/src/colservr

Files:

• mgqueryfilter.cpp (modified) (4 diffs)
• mgqueryfilter.h (modified) (2 diffs)
• mgsearch.cpp (modified) (1 diff)
• queryinfo.cpp (modified) (4 diffs)
• queryinfo.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -85 +85 @@
 /////////////////////////////////
 
+
+void mgqueryfilterclass::configure (const text_t &key, const text_tarray &cfgline) {
+  queryfilterclass::configure (key, cfgline);
+
+  if (key == "maxnumeric") {
+    maxnumeric = cfgline[0].getint();
+  }
+}
+
 // loads up phrases data structure with any phrases (that's the quoted bits)
 // occuring in the querystring
@@ -272 +281 @@
 
   num_phrases = 0;
-
+  maxnumeric = 4;
 }
 
@@ -446 +455 @@
   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
@@ -483 +495 @@
       }
     }
-
-#ifdef GSDL_BBC_COLLECTION
-    // This is a special hack for the BBC collection's ProgNumber index
-
-    // if we're searching the zzAB/zzAN index we want to remove all
-    // non-alphanumeric characters from the query string
-    text_t longindex; text_tarray splitindex;
-    indexmap.to2from ((*query_here).index, longindex);
-    splitchar (longindex.begin(), longindex.end(), ':', splitindex);
-    text_t &indextype = splitindex[1];
-    if (indextype == "zzabn") {
-      text_t new_querystring;
-      text_t::const_iterator here = (*query_here).querystring.begin();
-      text_t::const_iterator end = (*query_here).querystring.end();
-      while (here != end) {
-        if ((*here >= 'a' && *here <= 'z') || (*here >= 'A' && *here <= 'Z') ||
-            (*here >= '0' && *here <= '9')) {
-          new_querystring.push_back (*here);
-        }
-        here ++;
-      }
-      (*query_here).querystring = new_querystring;
-    }
-#endif
     query_here ++;
   }

trunk/gsdl/src/colservr/mgqueryfilter.h

@@ -51 +51 @@
   int num_phrases;
 
+  int maxnumeric;
+
   void get_phrase_terms (const text_t &querystring, 
              const termfreqclassarray &orgterms,
@@ -79 +81 @@
   virtual ~mgqueryfilterclass ();
 
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
+
   void filter (const FilterRequest_t &request,
            FilterResponse_t &response,

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -384 +384 @@
     mgq_ask(maxdocstr);
   }
+
+  char maxnumericstr[32];
+  sprintf(maxnumericstr, ".set maxnumeric %i", queryparams.maxnumeric);
+  mgq_ask(maxnumericstr);
+  
 }
 

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -46 +46 @@
   stemming = 0;
   maxdocs = -1;    // all
+  maxnumeric = 4;  // must default to the same value as mg_passes
 }
 
@@ -62 +63 @@
   stemming = q.stemming;
   maxdocs = q.maxdocs;
+  maxnumeric = q.maxnumeric;
 
   return *this;
@@ -79 +81 @@
       (x.casefolding == y.casefolding) &&
       (x.stemming == y.stemming) &&
-      (x.maxdocs == y.maxdocs));
+      (x.maxdocs == y.maxdocs) &&
+      (x.maxnumeric == y.maxnumeric));
 }
 
@@ -103 +106 @@
   outs << " stemming = \"" << q.stemming << "\"\n";
   outs << " maxdocs = \"" << q.maxdocs << "\"\n";
+  outs << " maxnumeric = \"" << q.maxnumeric << "\"\n";
   outs << "\n";
 

trunk/gsdl/src/colservr/queryinfo.h

@@ -65 +65 @@
   int stemming;
   int maxdocs;
+  int maxnumeric;
 
   queryparamclass ();