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

Timestamp:

2007-07-24T16:20:41+12:00 (17 years ago)

Author:

qq6

Message:

Jeffrey has fixed operating records of users database on Windows

File:

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

gsdl/trunk/src/recpt/userdb.cpp

@@ -77 +77 @@
 userdbclass::userdbclass(const text_t &userdbfilename)
 {
-  activated = (!userdb.opendatabase(userdbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+  storeduserdbfilename = userdbfilename;
+  activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+  if (activated == false) 
+    {
+      activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      if (activated == true)
+        {
+          userdb.closedatabase();
+          activated = (!userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true)) ? false : true;
+        }
+    }
+    
   external_db = false;
 }
@@ -227 +238 @@
       info["groups"] = userinfo.groups;
       info["comment"] = userinfo.comment;
-      
-      return (userdb.setinfo (username, info)) ? ERRNO_SUCCEED : ERRNO_GDBMACTIONFILED ;
+      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);         
+      return  result;
     }
   return ERRNO_CONNECTIONFAILED;
@@ -290 +305 @@
   if (activated == true)
     {
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_WRCREAT, 1000, true);
       userdb.deletekey (username);
+      userdb.closedatabase();
+      userdb.opendatabase(storeduserdbfilename, GDBM_READER, 1000, true);
       return ERRNO_SUCCEED;
     }
@@ -335 +354 @@
   return ERRNO_CONNECTIONFAILED;
 }
-
-//an alernative way to colse the database if the class can't reach the destructor
-void userdbclass::closedatabase()
-{
-   userdb.closedatabase();
-}
-
 //==========================================//
 //       userdbclass functions (End)        //
@@ -351 +363 @@
 keydbclass::keydbclass(const text_t &keydbfilename)
 {
-  activated = (!keydb.opendatabase(keydbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+  storedkeydbfilename = keydbfilename;
+  activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+  if (activated == false) 
+    {
+      activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      if (activated == true)
+        {
+          keydb.closedatabase();
+          activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+        }
+    }
   external_db = false;
 }
@@ -399 +421 @@
       keydata["time"] = time2text(time(NULL));
       
+      keydb.closedatabase();
+      keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
       if (!keydb.setinfo (crypt_userkey, keydata)) 
         {
           userkey.clear(); // failed
         }
+      keydb.closedatabase();
+      keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true); 
       
       return userkey;
@@ -434 +460 @@
             // 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); 
             return true;
           }
@@ -477 +507 @@
     }
 }
-
-//an alernative way to colse the database if the class can't reach the destructor
-void keydbclass::closedatabase()
-{
-   keydb.closedatabase();
-}
 //==========================================//
 //       keydbclass functions (End)         //