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

Timestamp:

2008-05-22T12:58:14+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Replaced the "getfirstkey()" and "getnextkey()" functions in dbclass with "getkeys()" (which returns them all). These functions were only used in userdb.cpp, and having the one function is simpler without being (much) less efficient. Also, implementing getkeys() for the new sql db classes will be easier than getfirstkey() and getnextkey().

File:

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

gsdl/trunk/src/recpt/userdb.cpp

@@ -332 +332 @@
     {
       userinfo_array.erase(userinfo_array.begin(), userinfo_array.end());
-      text_t user = userdb->getfirstkey();
-      while (!user.empty()) {
+      text_tarray userlist = userdb->getkeys();
+      text_tarray::iterator user_iterator = userlist.begin();
+      while (user_iterator != userlist.end())
+      {
         userinfo_t one_userinfo;
-        int returned = get_user_info(user, one_userinfo);
+        int returned = get_user_info(*user_iterator, one_userinfo);
         if (returned != ERRNO_SUCCEED) return returned;
         userinfo_array.push_back(one_userinfo);
-        user = userdb->getnextkey(user);
+    user_iterator++;
       }
       return ERRNO_SUCCEED;
@@ -353 +355 @@
     {
       userlist.erase (userlist.begin(), userlist.end());
-      
-      text_t user = userdb->getfirstkey ();
-      while (!user.empty()) {
-        userlist.push_back(user);
-        user = userdb->getnextkey (user);
-      }
+      userlist = userdb->getkeys();
       return ERRNO_SUCCEED;
     }
@@ -490 +487 @@
       // get a list of keys created more than keydecay seconds agon
       text_tarray oldkeys;
-      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))  {
+
+      text_tarray keylist = keydb->getkeys();
+      text_tarray::iterator key_iterator = keylist.begin();
+      while (key_iterator != keylist.end())
+      {
+        if (keydb->getinfo (*key_iterator, info))  {
           keycreation = text2time (info["time"]);
           if (keycreation != (time_t)-1 && difftime (timenow, keycreation) > keydecay) {
             // found an old key
-            oldkeys.push_back(key);
+            oldkeys.push_back(*key_iterator);
           }
         }
         
-        key = keydb->getnextkey (key);
+    key_iterator++;
       }