Changeset 21324 for main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp

Timestamp:

2009-12-09T21:41:14+13:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene)

File:

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

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

@@ -36 +36 @@
 #include "sqlbrowsefilter.h"
 #include "queryfilter.h"
+
+#ifdef ENABLE_MG
 #include "mgqueryfilter.h"
+#include "mgsource.h"
+#endif
+#ifdef ENABLE_MGPP
 #include "mgppqueryfilter.h"
-#include "mgsource.h"
+#include "mgppsource.h"
+#endif
+#ifdef ENABLE_LUCENE
 #include "lucenequeryfilter.h"
 #include "lucenesource.h"
+#endif
 
 #include <assert.h>
@@ -61 +69 @@
   text_tarray collections;
 
+#ifdef ENABLE_MG
   mgsearch = NULL;
+#endif
+#ifdef ENABLE_MGPP
   mgppsearch = NULL;
+#endif
+#ifdef ENABLE_LUCENE
   lucenesearch = NULL;
+#endif
 
   // get gsdlhome (if we fail the error will be picked up later -- in
@@ -100 +114 @@
   httpprefix = httpprefix_arg;
 
+#ifdef ENABLE_MG
   mgsearch = NULL;
+#endif
+#ifdef ENABLE_MGPP
   mgppsearch = NULL;
+#endif
+#ifdef ENABLE_LUCENE
   lucenesearch = NULL;
+#endif
 
 }
@@ -108 +128 @@
 collectset::collectset ()
 {
+#ifdef ENABLE_MG
   mgsearch = NULL;
+#endif
+#ifdef ENABLE_MGPP
   mgppsearch = NULL;
+#endif
+#ifdef ENABLE_LUCENE
   lucenesearch = NULL;
+#endif
 }
 
@@ -310 +336 @@
 
     if (buildtype == "mg") {
+#ifdef ENABLE_MG
       mgsearch = new mgsearchclass();
  
@@ -323 +350 @@
       mgsource->set_textsearchptr (mgsearch);
       cserver->add_source (mgsource);
+#else
+      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
+#endif
     }
     else if (buildtype == "mgpp") {
+#ifdef ENABLE_MGPP
       mgppsearch = new mgppsearchclass();
 
@@ -333 +364 @@
       cserver->add_filter (queryfilter);
       
-      // add a mg source
-      mgsourceclass *mgsource = new mgsourceclass ();
-      mgsource->set_db_ptr(db_ptr);
-      mgsource->set_textsearchptr (mgppsearch);
-      cserver->add_source (mgsource);
+      // add a mgpp source
+      mgppsourceclass *mgppsource = new mgppsourceclass ();
+      mgppsource->set_db_ptr(db_ptr);
+      mgppsource->set_textsearchptr (mgppsearch);
+      cserver->add_source (mgppsource);
+#else
+      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
+#endif
     }
     else if (buildtype == "lucene") {
+#ifdef ENABLE_LUCENE
       lucenesearch = new lucenesearchclass();
       lucenesearch->set_gsdlhome(gsdlhome); 
@@ -354 +389 @@
       lucenesource->set_textsearchptr (lucenesearch);
       cserver->add_source (lucenesource);
+#else
+      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
+#endif
     }
     else {
-      cerr << "Warning: unrecognized buildtype" << buildtype << endl;
+      cerr << "Warning: unrecognized buildtype " << buildtype << endl;
     }
 
@@ -414 +452 @@
 void collectset::remove_all_collections () {
 
+#ifdef ENABLE_MG
   // first unload any cached mg databases
   if (mgsearch != NULL) {
     mgsearch->unload_database();
   }
+#endif
 
   // now delete the collection server objects
@@ -512 +552 @@
   if (cservers.getcollectserver(collection) == NULL) return;
 
+#ifdef ENABLE_MG
   // first unload any cached mg databases - we may need to do something
   // similar to this for mgpp and lucene too
@@ -517 +558 @@
     mgsearch->unload_database();
   }
+#endif
 
   // now delete the collection server object