Changeset 22050 for main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

Timestamp:

2010-05-06T12:58:19+12:00 (14 years ago)

Author:

davidb

Message:

Updating of code to support sql-query filter

File:

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

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

@@ -52 +52 @@
   else {
     cerr << "Error: buildtype '" << buildtype << "' is not a recognized indexer for Greenstone." << endl;
+  }
+
+}
+
+
+void check_if_valid_infodbtype(const text_t& infodbtype)
+{
+  if (infodbtype=="gdbm") {
+#ifndef USE_GDBM
+    cerr << "Warning: Greenstone installation has not been compiled to support infodbtype 'gdbm'." << endl;
+#endif
+  }
+  else if (infodbtype=="gdbm-txtgz") {
+#ifndef USE_GDBM
+    cerr << "Warning: Greenstone installation has not been compiled to support infodbtype 'gdbm-txtgz'." << endl;
+#endif
+  }
+  else if (infodbtype=="jdbm") {
+#ifndef USE_JDBM
+    cerr << "Warning: Greenstone installation has not been compiled to support infodbtype 'jdbm'." << endl;
+#endif
+  }
+  else if (infodbtype=="sqlite") {
+#ifndef USE_SQLITE
+    cerr << "Warning: Greenstone installation has not been compiled to support infodbtype 'sqlite'." << endl;
+#endif
+  }
+  else if (infodbtype=="mssql") {
+#ifndef USE_MSSQL
+    cerr << "Warning: Greenstone installation has not been compiled to support infodbtype 'mssql'." << endl;
+#endif
+  }
+
+  else {
+    cerr << "Error: infodbtype '" << infodbtype << "' is not a recognized database type for Greenstone." << endl;
   }
 
@@ -242 +277 @@
       //collectinfo.searchTypes = cfgline;
     }
+    else if (key == "infodbtype") {
+      check_if_valid_infodbtype(value); // prints warning if value (database type) is invalid
+      collectinfo.infodbType = value;
+    }
     else if (key == "separate_cjk") {
       if (value == "true") collectinfo.isSegmented = true;