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

Timestamp:

2001-06-13T15:16:57+12:00 (23 years ago)

Author:

sjboddie

Message:

Added an unload_database() function to mgsearchclass which is called by
collectset's remove_collection() function. This fixes a bug that was
present when using the windows local library (or any persistent server
form of Greenstone) to edit an existing collection from the collector (i.e.
the collector occassionally couldn't delete the existing indexes because
they were being held open by mg).

Also removed #ifdefs that were disabling the use of mgpp collections on
Windows and got mgppqueryfilter and mgppsearch compiling on Windows. mgpp
collections should now work on Windows exactly as they do on Unix (I
haven't tested it yet though)

File:

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

trunk/gsdl/src/colservr/collectset.cpp

@@ -105 +105 @@
       
       if (buildtype == "mg") {
-        mgsearchclass *mgsearch = new mgsearchclass();
+        mgsearch = new mgsearchclass();
         
         // add a query filter
@@ -118 +118 @@
         mggdbmsource->set_mgsearchptr (mgsearch);
         cserver->add_source (mggdbmsource);
-      }
-#ifndef __WIN32__
-      
-      else if (buildtype == "mgpp") {
-        
-        mgppsearchclass *mgsearch = new mgppsearchclass();
+
+      } else if (buildtype == "mgpp") {
+        
+        mgppsearch = new mgppsearchclass();
         
         // add a query filter
         mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
         queryfilter->set_gdbmptr (gdbmhandler);
-        queryfilter->set_mgsearchptr (mgsearch);
+        queryfilter->set_mgsearchptr (mgppsearch);
         cserver->add_filter (queryfilter);
         
@@ -137 +135 @@
         cserver->add_source (mggdbmsource);   
       }
-#endif
       
       // inform collection server and everything it contains about its
@@ -231 +228 @@
   // do this would be preferable though - Stefan.
   text_t buildtype = "mg"; // mg is default
-  // (for now we'll just ignore mgpp if on windows)
-#ifndef __WIN32__
+
   text_tarray cfgline;
   text_t key;
@@ -253 +249 @@
   }
   delete build_cfgc;
-#endif
 
   collectserver *cserver = new collectserver();
@@ -269 +264 @@
  
   if (buildtype == "mg") {
-    mgsearchclass *mgsearch = new mgsearchclass();
+    mgsearch = new mgsearchclass();
  
     // add a query filter
@@ -282 +277 @@
     mggdbmsource->set_mgsearchptr (mgsearch);
     cserver->add_source (mggdbmsource);
-  }
-
-#ifndef __WIN32__
-
-  else if (buildtype == "mgpp") {
+
+  } else if (buildtype == "mgpp") {
       
-    mgppsearchclass *mgsearch = new mgppsearchclass();
+    mgppsearch = new mgppsearchclass();
 
     // add a query filter
     mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
     queryfilter->set_gdbmptr (gdbmhandler);
-    queryfilter->set_mgsearchptr (mgsearch);
+    queryfilter->set_mgsearchptr (mgppsearch);
     cserver->add_filter (queryfilter);
       
@@ -303 +295 @@
     
   }
-#endif    
 
   // inform collection server and everything it contains about its
@@ -324 +315 @@
 // cleans up all collectservers when the program exits.
 void collectset::remove_collection (const text_t &collection, ostream &logout) {
+
+  // first unload any cached mg databases - we may need to do something
+  // similar to this for mgpp too
+  if (mgsearch != NULL) {
+    mgsearch->unload_database();
+  }
+
+  // now delete the collection server object
   collectservermapclass::iterator here = cservers.begin();
   collectservermapclass::iterator end = cservers.end();