Changeset 21489 for main/trunk/greenstone2

Timestamp:

2010-01-18T14:13:17+13:00 (14 years ago)

Author:

mdewsnip

Message:

Modifying userdb.cpp so it uses the more general dbclass object instead of being hard-wired to use gdbmclass. However, this class is still set up to use gdbm, provided USE_GDBM is set (which it always is in the main Greenstone). The problem with the user database is it is Greenstone-specific, not collection-specific, so there is no infodbtype option to check to see what database type should be used (a new option will need to be created in the main.cfg file). If USE_GDBM isn't set, the userdb class will do nothing.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/userdb.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/userdb.cpp

@@ -26 +26 @@
 #include "gsdlconf.h"
 #include "userdb.h"
-#include "gdbmclass.h"
 #include "gsdltimes.h"
 #include "fileutil.h"
 #include <stdlib.h>
+
+#ifdef USE_GDBM
+#include "gdbmclass.h"
+#endif
 
 // include crypt
@@ -79 +82 @@
 {
   storeduserdbfilename = userdbfilename;
+
+  // Create a dbclass of the correct type
+  userdb = NULL;
+
+  // Use GDBM only at this stage
+#ifdef USE_GDBM
   userdb = new gdbmclass();
+#endif
+
+  // Check a dbclass of some type has been created
+  if (userdb == NULL)
+  {
+    activated = false;
+    return;
+  }
+
   activated = (!userdb->opendatabase(storeduserdbfilename, DB_READER, 1000, true)) ? false : true;
   if (activated == false) 
@@ -370 +388 @@
 {
   storedkeydbfilename = keydbfilename;
+
+  // Create a dbclass of the correct type
+  keydb = NULL;
+
+  // Use GDBM only at this stage
+#ifdef USE_GDBM
   keydb = new gdbmclass();
+#endif
+
+  // Check a dbclass of some type has been created
+  if (keydb == NULL)
+  {
+    activated = false;
+    return;
+  }
+
   activated = keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true);
   if (activated == false)