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

Timestamp:

2010-01-15T15:16:03+13:00 (14 years ago)

Author:

mdewsnip

Message:

Created USE_GDBM and USE_JDBM defines that work similar to USE_SQLITE and USE_MSSQL for controlling which infodb types are compiled in. Currently these are not configurable through the configure scripts and are always on.

File:

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

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

@@ -29 +29 @@
 #include "colservrconfig.h"
 #include "gsdlsitecfg.h"
-#include "gdbmclass.h"
-#include "jdbmnaiveclass.h"
 #include "gsdltools.h"
 #include "fileutil.h"
@@ -52 +50 @@
 
 #include <assert.h>
+
+#ifdef USE_GDBM
+#include "gdbmclass.h"
+#endif
+
+#ifdef USE_JDBM
+#include "jdbmnaiveclass.h"
+#endif
 
 #ifdef USE_SQLITE
@@ -355 +361 @@
 #endif
 
+#ifdef USE_JDBM
     if (infodbtype == "jdbm") {
 
@@ -360 +367 @@
     db_ptr = jdbm_db_ptr;
     }
-  
+#endif
+
     // Use GDBM if the infodb type is empty or not one of the values above
     if (db_ptr == NULL) {
+#ifdef USE_GDBM
       db_ptr = new gdbmclass();
+#endif
     }