Changeset 24758 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2011-10-13T21:45:21+13:00 (13 years ago)

Author:

ak19

Message:

Related to bugfix of previous commit: this time, not only is the mgsearch object unloaded, but following the suggestion in the existing comment, the mgppsearch and lucenesearch objects are also unloaded() in the two occasions where mgsearch is.

File:

• main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp

@@ -496 +496 @@
   }
 #endif
+#ifdef ENABLE_MGPP
+  if (mgppsearch != NULL) {
+    mgppsearch->unload_database();
+  }
+#endif 
+#ifdef ENABLE_LUCENE
+  if (lucenesearch != NULL) {
+    lucenesearch->unload_database();
+  }
+#endif
 
   // now delete the collection server objects
@@ -594 +604 @@
   }
 #endif
+#ifdef ENABLE_MGPP
+  if (mgppsearch != NULL) {
+    mgppsearch->unload_database();
+  }
+#endif 
+#ifdef ENABLE_LUCENE
+  if (lucenesearch != NULL) {
+    lucenesearch->unload_database();
+  }
+#endif 
 
   // now delete the collection server object