Changeset 15729 for gsdl

Timestamp:

2008-05-27T16:09:01+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Now the collection server looks at the "infodbtype" field in build.cfg and creates either a "gdbmclass" or "sqlitedbclass" as appropriate!

Location:

gsdl/trunk/src/colservr

Files:

• Makefile.in (modified) (2 diffs)
• collectset.cpp (modified) (4 diffs)

gsdl/trunk/src/colservr/Makefile.in

@@ -32 +32 @@
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
+SQLITE_DEFINES = -DUSE_SQLITE
 SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/sqlite3/linux/include
 SQLITE_OBJECTS = sqlitedbclass.o
 SQLITE_SOURCES = sqlitedbclass.cpp
 else
+SQLITE_DEFINES = 
 SQLITE_INCLUDES = 
 SQLITE_OBJECTS = 
@@ -47 +49 @@
 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
-DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib \

gsdl/trunk/src/colservr/collectset.cpp

@@ -42 +42 @@
 #include <assert.h>
 
+#ifdef USE_SQLITE
+#include "sqlitedbclass.h"
+#endif
+
 
 collectset::collectset (text_t &gsdlhome) {
@@ -194 +198 @@
   // read config file to see if built with mg, mgpp, or lucene
   text_t buildtype = "mg"; // mg is default
+  text_t infodbtype = "gdbm"; // gdbm is default
 
   text_tarray cfgline;
@@ -208 +213 @@
     if (key == "buildtype") {
       buildtype = cfgline[0];
-      break;
+    }
+    if (key == "infodbtype") {
+      infodbtype = cfgline[0];
     }
       }
@@ -217 +224 @@
 
   collectserver *cserver = new collectserver();
-  gdbmclass *db_ptr = new gdbmclass();
+
+  // Create a dbclass of the correct type
+  dbclass *db_ptr = NULL;
+
+#ifdef USE_SQLITE
+  if (infodbtype == "sqlite")
+  {
+    db_ptr = new sqlitedbclass();
+  }
+#endif
+
+  // Use GDBM if the infodb type is empty or not one of the values above
+  if (db_ptr == NULL)
+  {
+    db_ptr = new gdbmclass();
+  }
 
   // add a null filter