Changeset 8028 for trunk/gsdl/src/colservr/collectset.cpp

Timestamp:

2004-08-23T23:14:51+12:00 (20 years ago)

Author:

davidb

Message:

Changes introduced to support lucene indexer.

File:

• trunk/gsdl/src/colservr/collectset.cpp (modified) (13 diffs)

trunk/gsdl/src/colservr/collectset.cpp

@@ -34 +34 @@
 #include "mgqueryfilter.h"
 #include "mgppqueryfilter.h"
+#include "lucenequeryfilter.h"
 #include "mggdbmsource.h"
+#include "lucenegdbmsource.h"
 #include "fileutil.h"
 #include <assert.h>
@@ -65 +67 @@
       }
 
-      // read config file to see if built with mg or mgpp
+      // read config file to see if built with mg, mgpp, or lucene
       text_t buildtype = "mg"; // mg is default
       text_tarray cfgline;
@@ -86 +88 @@
       
       confin.close();
-    
+
       // this memory is created but never destroyed
       // we're also not doing any error checking to make sure we didn't
@@ -108 +110 @@
         mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
         queryfilter->set_gdbmptr (gdbmhandler);
-        queryfilter->set_mgsearchptr (mgsearch);
+        queryfilter->set_textsearchptr (mgsearch);
         cserver->add_filter (queryfilter);
         
@@ -114 +116 @@
         mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
         mggdbmsource->set_gdbmptr (gdbmhandler);
-        mggdbmsource->set_mgsearchptr (mgsearch);
+        mggdbmsource->set_textsearchptr (mgsearch);
         cserver->add_source (mggdbmsource);
 
@@ -124 +126 @@
         mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
         queryfilter->set_gdbmptr (gdbmhandler);
-        queryfilter->set_mgsearchptr (mgppsearch);
+        queryfilter->set_textsearchptr (mgppsearch);
         cserver->add_filter (queryfilter);
         
@@ -130 +132 @@
         mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
         mggdbmsource->set_gdbmptr (gdbmhandler);
-        mggdbmsource->set_mgsearchptr (mgppsearch);
+        mggdbmsource->set_textsearchptr (mgppsearch);
         cserver->add_source (mggdbmsource);   
+      } else if (buildtype == "lucene") {
+        lucenesearch = new lucenesearchclass();
+        
+        // add a query filter
+        lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass();
+        queryfilter->set_gdbmptr (gdbmhandler);
+        queryfilter->set_textsearchptr (lucenesearch);
+        cserver->add_filter (queryfilter);
+        
+        // add a lucene and gdbm source
+        lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass ();
+        lucenegdbmsource->set_gdbmptr (gdbmhandler);
+        lucenegdbmsource->set_textsearchptr (lucenesearch);
+        cserver->add_source (lucenegdbmsource);   
       }
       
@@ -234 +250 @@
   }
       
-  // read config file to see if built with mg or mgpp
+  // read config file to see if built with mg, mgpp, or lucene
   // -- we can rely on the collection (and therefore the build.cfg)
   // being here since this is the null protocol - a nicer way to 
@@ -280 +296 @@
     mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
     queryfilter->set_gdbmptr (gdbmhandler);
-    queryfilter->set_mgsearchptr (mgsearch);
+    queryfilter->set_textsearchptr (mgsearch);
     cserver->add_filter (queryfilter);
     
@@ -286 +302 @@
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
     mggdbmsource->set_gdbmptr (gdbmhandler);
-    mggdbmsource->set_mgsearchptr (mgsearch);
+    mggdbmsource->set_textsearchptr (mgsearch);
     cserver->add_source (mggdbmsource);
 
@@ -296 +312 @@
     mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
     queryfilter->set_gdbmptr (gdbmhandler);
-    queryfilter->set_mgsearchptr (mgppsearch);
+    queryfilter->set_textsearchptr (mgppsearch);
     cserver->add_filter (queryfilter);
       
@@ -302 +318 @@
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
     mggdbmsource->set_gdbmptr (gdbmhandler);
-    mggdbmsource->set_mgsearchptr (mgppsearch);
+    mggdbmsource->set_textsearchptr (mgppsearch);
     cserver->add_source (mggdbmsource);
+
+  } else if (buildtype == "lucene") {
+      
+    lucenesearch = new lucenesearchclass();
+
+    // add a query filter
+    lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass();
+    queryfilter->set_gdbmptr (gdbmhandler);
+    queryfilter->set_textsearchptr (lucenesearch);
+    cserver->add_filter (queryfilter);
+      
+    // add a lucene and gdbm source
+    lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass ();
+    lucenegdbmsource->set_gdbmptr (gdbmhandler);
+    lucenegdbmsource->set_textsearchptr (lucenesearch);
+    cserver->add_source (lucenegdbmsource);
     
   }
@@ -332 +364 @@
 
   // first unload any cached mg databases - we may need to do something
-  // similar to this for mgpp too
+  // similar to this for mgpp and lucene too
   if (mgsearch != NULL) {
     mgsearch->unload_database();