Changeset 15586 for gsdl/trunk/src/recpt/userdb.cpp

Timestamp:

2008-05-20T11:16:23+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Changed userdbclass and keydbclass so they can use a general dbclass rather than specifically using gdbmclass.

File:

• gsdl/trunk/src/recpt/userdb.cpp (modified) (19 diffs)

gsdl/trunk/src/recpt/userdb.cpp

@@ -26 +26 @@
 #include "gsdlconf.h"
 #include "userdb.h"
+#include "gdbmclass.h"
 #include "gsdltimes.h"
 #include "fileutil.h"
@@ -78 +79 @@
 {
   storeduserdbfilename = userdbfilename;
-  activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+  userdb = new gdbmclass();
+  activated = (!userdb->opendatabase(storeduserdbfilename, DB_READER, 1000, true)) ? false : true;
   if (activated == false) 
     {
-      activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      activated = (!userdb->opendatabase(storeduserdbfilename, DB_WRITER_CREATE, 1000, true)) ? false : true;
       if (activated == true)
         {
-          userdb.closedatabase();
-          activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+          userdb->closedatabase();
+          activated = (!userdb->opendatabase(storeduserdbfilename, DB_READER, 1000, true)) ? false : true;
         }
     }
@@ -92 +94 @@
 }
 
-userdbclass::userdbclass(const gdbmclass &external_userdb)
-{
-  userdb = external_userdb;
-  activated = true;
-  external_db = true;
-}
-
 userdbclass::~userdbclass()
 {
-  if (external_db == false) { userdb.closedatabase();}
+  if (external_db == false)
+  {
+    userdb->closedatabase();
+    delete userdb;
+  }
 }
 
@@ -207 +206 @@
       infodbclass info;
       // See if we can get the user's infomration
-      if (userdb.getinfo (username, info)) 
+      if (userdb->getinfo (username, info)) 
         {
           userinfo.username = info["username"];
@@ -248 +247 @@
       info["groups"] = userinfo.groups;
       info["comment"] = userinfo.comment;
-      userdb.closedatabase();
-      userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true);
-      int result = (userdb.setinfo (username, info)) ? ERRNO_SUCCEED : ERRNO_GDBMACTIONFILED;
-      userdb.closedatabase();
-      userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true);         
+      userdb->closedatabase();
+      userdb->opendatabase(storeduserdbfilename, DB_WRITER_CREATE, 1000, true);
+      int result = (userdb->setinfo (username, info)) ? ERRNO_SUCCEED : ERRNO_DBACTIONFAILED;
+      userdb->closedatabase();
+      userdb->opendatabase(storeduserdbfilename, DB_READER, 1000, true);         
       return  result;
     }
@@ -278 +277 @@
     {
       infodbclass info;
-      if (userdb.getinfo (userinfo.username, info)) 
+      if (userdb->getinfo (userinfo.username, info)) 
         {
           // There is an existing username already
@@ -297 +296 @@
     {
       infodbclass info;
-      if (userdb.getinfo (userinfo.username, info)) 
+      if (userdb->getinfo (userinfo.username, info)) 
         {
           return set_user_info(userinfo.username, userinfo);
@@ -315 +314 @@
   if (activated == true)
     {
-      userdb.closedatabase();
-      userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true);
-      userdb.deletekey (username);
-      userdb.closedatabase();
-      userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true);
+      userdb->closedatabase();
+      userdb->opendatabase(storeduserdbfilename, DB_WRITER_CREATE, 1000, true);
+      userdb->deletekey (username);
+      userdb->closedatabase();
+      userdb->opendatabase(storeduserdbfilename, DB_READER, 1000, true);
       return ERRNO_SUCCEED;
     }
@@ -333 +332 @@
     {
       userinfo_array.erase(userinfo_array.begin(), userinfo_array.end());
-      text_t user = userdb.getfirstkey();
+      text_t user = userdb->getfirstkey();
       while (!user.empty()) {
         userinfo_t one_userinfo;
@@ -339 +338 @@
         if (returned != ERRNO_SUCCEED) return returned;
         userinfo_array.push_back(one_userinfo);
-        user = userdb.getnextkey(user);
+        user = userdb->getnextkey(user);
       }
       return ERRNO_SUCCEED;
@@ -355 +354 @@
       userlist.erase (userlist.begin(), userlist.end());
       
-      text_t user = userdb.getfirstkey ();
+      text_t user = userdb->getfirstkey ();
       while (!user.empty()) {
         userlist.push_back(user);
-        user = userdb.getnextkey (user);
+        user = userdb->getnextkey (user);
       }
       return ERRNO_SUCCEED;
@@ -374 +373 @@
 {
   storedkeydbfilename = keydbfilename;
-  activated = keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
+  keydb = new gdbmclass();
+  activated = keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true);
   if (activated == false) 
     {
-      activated = keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
+      activated = keydb->opendatabase(storedkeydbfilename, DB_WRITER_CREATE, 1000, true);
       if (activated == true)
         {
-          keydb.closedatabase();
-          activated = keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
+          keydb->closedatabase();
+          activated = keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true);
         }
     }
@@ -387 +387 @@
 }
 
-keydbclass::keydbclass(const gdbmclass &external_keydb)
-{
-  keydb = external_keydb;
-  activated = true;
-  external_db = true;
-}
-
 keydbclass::~keydbclass()
 {
-  if (external_db == false) { keydb.closedatabase();}
-}
+  if (external_db == false)
+  {
+    keydb->closedatabase();
+    delete keydb;
+  }
+}
+
 // generates a random key for the user, stores it in the database and
 // returns it so that it can be used in page generation
@@ -423 +421 @@
         // make sure this key is not in the database
         crypt_userkey = userdbclass::crypt_text(userkey);
-        if (keydb.exists (crypt_userkey)) userkey.clear();
+        if (keydb->exists (crypt_userkey)) userkey.clear();
       } while (userkey.empty());
       
@@ -431 +429 @@
       keydata["time"] = time2text(time(NULL));
       
-      keydb.closedatabase();
-      keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
-      if (!keydb.setinfo (crypt_userkey, keydata)) 
+      keydb->closedatabase();
+      keydb->opendatabase(storedkeydbfilename, DB_WRITER_CREATE, 1000, true);
+      if (!keydb->setinfo (crypt_userkey, keydata)) 
         {
           userkey.clear(); // failed
         }
-      keydb.closedatabase();
-      keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true); 
+      keydb->closedatabase();
+      keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true); 
       
       return userkey;
@@ -463 +461 @@
       text_t crypt_key = userdbclass::crypt_text(key);
       infodbclass info;
-      if (keydb.getinfo (crypt_key, info))  {
+      if (keydb->getinfo (crypt_key, info))  {
         if (info["user"] == thisuser.username) {
           time_t keycreation = text2time (info["time"]);
@@ -470 +468 @@
             // succeeded, update the key's time
             info["time"] = time2text(time(NULL));
-            keydb.closedatabase();
-            keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
-            keydb.setinfo (crypt_key, info);
-            keydb.closedatabase();
-            keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true); 
+            keydb->closedatabase();
+            keydb->opendatabase(storedkeydbfilename, DB_WRITER_CREATE, 1000, true);
+            keydb->setinfo (crypt_key, info);
+            keydb->closedatabase();
+            keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true); 
             return true;
           }
@@ -492 +490 @@
       // get a list of keys created more than keydecay seconds agon
       text_tarray oldkeys;
-      text_t key = keydb.getfirstkey ();
+      text_t key = keydb->getfirstkey ();
       infodbclass info;
       time_t timenow = text2time(time2text(time(NULL)));
       time_t keycreation = (time_t)-1;
       while (!key.empty()) {
-        if (keydb.getinfo (key, info))  {
+        if (keydb->getinfo (key, info))  {
           keycreation = text2time (info["time"]);
           if (keycreation != (time_t)-1 && difftime (timenow, keycreation) > keydecay) {
@@ -505 +503 @@
         }
         
-        key = keydb.getnextkey (key);
+        key = keydb->getnextkey (key);
       }
       
       // delete the old keys
       if (oldkeys.size() > 0) {
-    keydb.closedatabase();
-    keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
+    keydb->closedatabase();
+    keydb->opendatabase(storedkeydbfilename, DB_WRITER_CREATE, 1000, true);
     text_tarray::iterator keys_here = oldkeys.begin();
     text_tarray::iterator keys_end = oldkeys.end();
     while (keys_here != keys_end) {
-      keydb.deletekey(*keys_here);
+      keydb->deletekey(*keys_here);
       ++keys_here;
     }
-    keydb.closedatabase();
-    keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
+    keydb->closedatabase();
+    keydb->opendatabase(storedkeydbfilename, DB_READER, 1000, true);
       }
     }