Changeset 21324 for main/trunk/greenstone2/runtime-src/src/colservr/collectserver.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/collectserver.cpp (modified) (2 diffs)

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

@@ -29 +29 @@
 #include <assert.h>
 #include "display.h"
+
+void check_if_valid_buildtype(const text_t& buildtype)
+{
+  if (buildtype=="mg") {
+#ifndef ENABLE_MG
+    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'mg'." << endl;
+#endif
+  }
+
+  else if (buildtype=="mgpp") {
+#ifndef ENABLE_MGPP
+    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'mgpp'." << endl;
+#endif
+  }
+
+  else if (buildtype=="lucene") {
+#ifndef ENABLE_LUCENE
+    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'lucene'." << endl;
+#endif
+  }
+
+  else {
+    cerr << "Error: buildtype '" << buildtype << "' is not a recognized indexer for Greenstone." << endl;
+  }
+
+}
+
 
 
@@ -202 +229 @@
     else if (key == "httpprefix") collectinfo.httpprefix = value;
     else if (key == "receptionist") collectinfo.receptionist = value;
-    else if (key == "buildtype") collectinfo.buildType = value;
+    else if (key == "buildtype") {
+      check_if_valid_buildtype(value); // prints warning if value (indexer) is invalid
+      collectinfo.buildType = value;
+    }
     // backwards compatibility - searchytpes is now a format statement
     else if (key == "searchtype") { // means buildtype is mgpp
       if (collectinfo.buildType.empty()) {
+    check_if_valid_buildtype("mgpp"); // prints warning if value (indexer) is invalid
     collectinfo.buildType = "mgpp";
       }