Changeset 22067 for main/trunk/greenstone2/runtime-src/src/recpt/userdb.cpp

Timestamp:

2010-05-07T21:11:22+12:00 (14 years ago)

Author:

ak19

Message:

1. More changes to makefiles: rm JDBMWrapper.jar and jdbm.jar on clean. 2. DB files (argdb, users, key, history) now not only for gdbm but to work with other db types like jdbm, sqlite and mssql.

File:

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

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

@@ -30 +30 @@
 #include <stdlib.h>
 
-#ifdef USE_GDBM
+
+#if defined(USE_GDBM)
 #include "gdbmclass.h"
+#define DBCLASS gdbmclass
+#define USERDBFNAME "users.gdb"
+#define KEYDBFNAME "key.gdb"
+
+#elif defined(USE_JDBM)
+#include "jdbmnaiveclass.h"
+#define DBCLASS jdbmnaiveclass
+#define USERDBFNAME "users.jdb"
+#define KEYDBFNAME "key.jdb"
+
+#elif defined(USE_SQLITE)
+#include "sqlitedbclass.h"
+#define DBCLASS sqlitedbclass
+#define USERDBFNAME "users.litedb"
+#define KEYDBFNAME "key.litedb"
+
+#elif defined(USE_MSSQL)
+#include "mssqldbclass.h"
+#define DBCLASS mssqldbclass
+#define USERDBFNAME "users.msdb"
+#define KEYDBFNAME "key.msdb"
+
+#else
+#error "Unable to compile Greenstone. Need at least one database backend enabled."
 #endif
+
 
 // include crypt
@@ -45 +71 @@
 #endif
 
+
 //==========================================//
 //      userinfo_t functions (Start)        //
@@ -79 +106 @@
 //      userdbclass functions (Start)       //
 //==========================================//
-userdbclass::userdbclass(const text_t &userdbfilename)
-{
-  storeduserdbfilename = userdbfilename;
+userdbclass::userdbclass(const text_t &gsdlhome)
+{
+
+  storeduserdbfilename = filename_cat(gsdlhome, "etc", USERDBFNAME);
 
   // Create a dbclass of the correct type
   userdb = NULL;
 
-  // Use GDBM only at this stage
-#ifdef USE_GDBM
-  userdb = new gdbmclass();
-#endif
+  // Use the correct database type
+  userdb = new DBCLASS(gsdlhome);
 
   // Check a dbclass of some type has been created
@@ -385 +411 @@
 //      keydbclass functions (Start)        //
 //==========================================//
-keydbclass::keydbclass(const text_t &keydbfilename)
-{
-  storedkeydbfilename = keydbfilename;
+keydbclass::keydbclass(const text_t &gsdlhome)
+{
+  storedkeydbfilename = filename_cat(gsdlhome, "etc", KEYDBFNAME);
 
   // Create a dbclass of the correct type
   keydb = NULL;
 
-  // Use GDBM only at this stage
-#ifdef USE_GDBM
-  keydb = new gdbmclass();
-#endif
+  // Use the correct DB class type at this stage
+  keydb = new DBCLASS(gsdlhome);
 
   // Check a dbclass of some type has been created