Changeset 1327 for trunk/gsdl/src/recpt/librarymain.cpp

Timestamp:

2000-08-02T14:05:36+12:00 (24 years ago)

Author:

kjm18

Message:

incorporated support for mgpp collections. searchclass and queryfilter type (mg/mgpp)
for a collection are determined on basis of buildtype field in build.cfg.

File:

• trunk/gsdl/src/recpt/librarymain.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -30 +30 @@
 #include "filter.h"
 #include "browsefilter.h"
-#include "queryfilter.h"
+#include "mgqueryfilter.h"
+#include "mgppqueryfilter.h"
 #include "infodbclass.h"
+#include "mggdbmsource.h"
 #include "mgsearch.h"
-#include "mggdbmsource.h"
+#include "mgppsearch.h"
 #include "fileutil.h"
 #include <assert.h>
@@ -62 +64 @@
   receptionist recpt;
   nullproto nproto;
+
   text_tarray collections;
 
@@ -69 +72 @@
   text_t collectdir = filename_cat (gsdlhome, "collect");
   read_dir (collectdir, collections);
-
+  
   text_tarray::const_iterator thiscol = collections.begin();
   text_tarray::const_iterator endcol = collections.end();
@@ -76 +79 @@
     
     // ignore the modelcol
-    if (*thiscol == "modelcol") {thiscol ++; continue;}
-    
+
+    if (*thiscol == "modelcol") {
+      thiscol ++;
+      continue;
+    }
+    
+    // read config file to see if built with mg or mgpp
+    text_t buildtype = "mg"; // mg is default
+    text_tarray cfgline;
+    text_t key;
+    text_t filename = filename_cat(collectdir, *thiscol, "index/build.cfg");
+    ifstream confin(filename.getcstr());
+
+    if (confin) {
+      while (read_cfg_line(confin, cfgline) >= 0) {
+    if (cfgline.size() ==2 ) {
+      key = cfgline[0];
+      cfgline.erase(cfgline.begin());
+      if (key =="buildtype") {
+        buildtype = cfgline[0];
+        break;
+      }
+    }
+      }
+    }
+    
+    confin.close();
+
     // this memory is created but never destroyed
     // we're also not doing any error checking to make sure we didn't
@@ -83 +112 @@
     collectserver *cserver = new collectserver();
     gdbmclass *gdbmhandler = new gdbmclass();
-    mgsearchclass *mgsearch = new mgsearchclass();
-    
+
     // add a null filter
     filterclass *filter = new filterclass ();
@@ -92 +120 @@
     browsefilterclass *browsefilter = new browsefilterclass();
     browsefilter->set_gdbmptr (gdbmhandler);
-    cserver->add_filter (browsefilter);
-    
-    // add a query filter
-    queryfilterclass *queryfilter = new queryfilterclass();
-    queryfilter->set_gdbmptr (gdbmhandler);
-    queryfilter->set_mgsearchptr (mgsearch);
-    cserver->add_filter (queryfilter);
-    
-    // add a mg and gdbm source
-    mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-    mggdbmsource->set_gdbmptr (gdbmhandler);
-    mggdbmsource->set_mgsearchptr (mgsearch);
-    cserver->add_source (mggdbmsource);
+    cserver->add_filter (browsefilter);  
+ 
+    if (buildtype == "mg") {
+       mgsearchclass *mgsearch = new mgsearchclass();
+ 
+       // add a query filter
+       mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
+       queryfilter->set_gdbmptr (gdbmhandler);
+       queryfilter->set_mgsearchptr (mgsearch);
+       cserver->add_filter (queryfilter);
+       
+       // add a mg and gdbm source
+       mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
+       mggdbmsource->set_gdbmptr (gdbmhandler);
+       mggdbmsource->set_mgsearchptr (mgsearch);
+       cserver->add_source (mggdbmsource);
+   
+    }
+    else if (buildtype == "mgpp") {
+      
+      mgppsearchclass *mgsearch = new mgppsearchclass();
+
+      // add a query filter
+      mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
+      queryfilter->set_gdbmptr (gdbmhandler);
+      queryfilter->set_mgsearchptr (mgsearch);
+      cserver->add_filter (queryfilter);
+      
+      // add a mg and gdbm source
+      mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
+      mggdbmsource->set_gdbmptr (gdbmhandler);
+      mggdbmsource->set_mgsearchptr (mgsearch);
+      cserver->add_source (mggdbmsource);
+   
+    }
     
     // inform collection server and everything it contains about its