Changeset 1324 for trunk/gsdl/src/colservr/mgsearch.cpp

Timestamp:

2000-08-02T12:58:29+12:00 (24 years ago)

Author:

kjm18

Message:

mgpp incorporated. the old mgsearchclass and queryfilterclass are changed.
Have a base searchclass, from which mgsearchclass and mgppsearchclass inherit.
Have a base queryfilterclass, from which mgqueryfilterclass and
mgppqueryfilterclass inherit. librarymain in recpt should choose the appropriate
type (mg vs mgpp) for each collection.

File:

• trunk/gsdl/src/colservr/mgsearch.cpp (modified) (5 diffs)

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -232 +232 @@
 
 mgsearchclass::mgsearchclass ()
-{
-  cache = new querycache (RESULTCACHESIZE);
+  : searchclass() {
+ 
 }
 
@@ -243 +243 @@
       cache = NULL;
     }
-}
-
-
-void mgsearchclass::setcollectdir (const text_t &thecollectdir)
-{
-  collectdir = thecollectdir;
 }
 
@@ -308 +302 @@
 bool mgsearchclass::search(const queryparamclass &queryparams, 
                queryresultsclass &queryresults) {
-  assert (cache != NULL);
+  //  assert (cache != NULL);
 
   queryresults.clear();
-
+  cerr << "mgsearch start of search"<<endl;
   // first check the cache
-  if (cache->find(queryparams, queryresults)) return true;
-
+  if (cache != NULL) {
+    if (cache->find(queryparams, queryresults)) return true;
+  }
   // make sure there is a query to be processed
   if (!has_unicode_letdig(queryparams.querystring)) return true;
@@ -320 +315 @@
   if (makeindexcurrent (queryparams.index, queryparams.subcollection,
             queryparams.language, queryparams.collection)) {
+    cerr << "made index current "<<endl;
     setsearchmode (queryparams);
     submitquery (queryparams);
     getresults (queryparams, queryresults);
+    cerr << "got results"<<endl;
     return true;
   }
@@ -512 +509 @@
   return (bool)databaseloaded;
 }
+