Changeset 9030

Timestamp:

2005-02-14T17:20:06+13:00 (19 years ago)

Author:

davidb

Message:

Update of collectset API argument to fit in with Stefan's apache module code.

File:

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

trunk/gsdl/src/colservr/collectset.cpp

@@ -35 +35 @@
 #include "mgppqueryfilter.h"
 #include "mggdbmsource.h"
-
-#ifdef USE_LUCENE
 #include "lucenequeryfilter.h"
 #include "lucenegdbmsource.h"
-#endif
 
 #include "fileutil.h"
@@ -139 +136 @@
         cserver->add_source (mggdbmsource);   
       } else if (buildtype == "lucene") {
-#ifdef USE_LUCENE
         lucenesearch = new lucenesearchclass();
         
@@ -153 +149 @@
         lucenegdbmsource->set_textsearchptr (lucenesearch);
         cserver->add_source (lucenegdbmsource);   
-#else
-        cerr << "Warning: Greenstone not compiled with Lucene support" << endl;
-#endif    
   }
 
@@ -241 +234 @@
 }
 
+
+void collectset::add_all_collections(const text_t &gsdlhome) {
+
+  text_tarray collections;
+  text_t collectdir = filename_cat(gsdlhome, "collect");
+  if (read_dir(collectdir, collections)) {
+
+    text_tarray::const_iterator thiscol = collections.begin();
+    text_tarray::const_iterator endcol = collections.end();
+
+    while (thiscol != endcol) {
+    
+      // ignore the modelcol
+      if (*thiscol == "modelcol") {
+    thiscol ++;
+    continue;
+      }
+    
+      // create collection server and add to null protocol
+      this->add_collection (*thiscol, gsdlhome);
+    
+      thiscol ++;
+    }
+  }
+}
+
 // add_collection sets up the collectionserver and calls
 // add_collectserver
-void collectset::add_collection (const text_t &collection, void *recpt, 
-                 const text_t &gsdlhome, const text_t &gdbmhome) {
+void collectset::add_collection (const text_t &collection, 
+                 const text_t &gsdlhome) {
 
   // if an old collection server exists for this collection we should
@@ -331 +350 @@
 
   } else if (buildtype == "lucene") {
-#ifdef USE_LUCENE      
     lucenesearch = new lucenesearchclass();
 
@@ -345 +363 @@
     lucenegdbmsource->set_textsearchptr (lucenesearch);
     cserver->add_source (lucenegdbmsource);
-#else
-    cerr << "Warning: Greenstone not compiled with Lucene support" << endl;
-#endif    
-    
   }
 
@@ -365 +379 @@
   cservers.addcollectserver (cserver);
 }
+
+void collectset::remove_all_collections () {
+
+  // first unload any cached mg databases
+  if (mgsearch != NULL) {
+    mgsearch->unload_database();
+  }
+
+  // now delete the collection server objects
+  collectservermapclass::iterator here = cservers.begin();
+  collectservermapclass::iterator end = cservers.end();
+
+  while (here != end) {
+    if ((*here).second.c != NULL) {
+      delete (*here).second.c;
+    }
+    here ++;
+  }
+  cservers.clear();
+}
+
 
 // remove_collection deletes the collection server of collection.