Changeset 5d836bde01291d90fa3c62d9841ee1084afa3ff7

Timestamp:

08/16/10 20:39:35 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

563ece2aeca700b9245bc2ac709c7fd346fea911

Parents:

994811461679afe70ab81e079fd87191d609be9d

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/16/10 20:39:35)

Message:

[db::user,db::db] Update user data by parsing the new record, not directly

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Location:

db

Files:

• db.cc (modified) (3 diffs)
• db.hh (modified) (2 diffs)
• user.cc (modified) (6 diffs)
• user.hh (modified) (1 diff)

db/db.cc

@@ -295 +295 @@
         }
 
+        void db::read_record(db_reader &dr, boost::posix_time::ptime timestamp)
+        {
+                std::string line;
+                dr.readline(line);
+                std::string cmd = util::split(line);
+                if (cmd == "NEWGROUP")
+                        do_newgroup(dr, line, timestamp);
+                else if (cmd == "USER")
+                        do_user(dr, line);
+                else if (cmd == "ROLE")
+                        do_role(dr, line);
+                else if (cmd == "ARTICLE")
+                        do_article(dr, line);
+                else
+                        throw illformed_db("unrecognized record type " + cmd);
+        }
+
         void db::init()
         {                
@@ -319 +336 @@
                         try
                         {
-                                dr.readline(line);
-                                std::string cmd = util::split(line);
-                                if (cmd == "NEWGROUP")
-                                        do_newgroup(dr, line, timestamp);
-                                else if (cmd == "USER")
-                                        do_user(dr, line);
-                                else if (cmd == "ROLE")
-                                        do_role(dr, line);
-                                else if (cmd == "ARTICLE")
-                                        do_article(dr, line);
-                                else
-                                {
-                                        logger::logline ll;
-                                        ll << "warning: unrecognized "
-                                           << "record type "
-                                           << cmd;
-                                        while (true)
-                                        {
-                                                dr.readline(line);
-                                                util::strip(line);
-                                                if (line == ".END") break;
-                                        }
-                                }
+                                read_record(dr, timestamp);
                         }
                         catch (illformed_db &id)
@@ -509 +504 @@
                         record += '\n';
 
+                boost::posix_time::ptime timestamp =
+                        boost::posix_time::second_clock::universal_time();
+
                 std::ofstream dbfile(dbname.c_str(), std::ios_base::app);
                 dbfile << ".BEGIN "
-                       << boost::posix_time::to_iso_string(
-                               boost::posix_time::second_clock::universal_time()
-                               )
+                       << boost::posix_time::to_iso_string(timestamp)
                        << "\n"
                        << record
                        << ".END\n";
                 dbfile.close();
+                std::istringstream ss(record);
+                db_reader dr(ss);
+                read_record(dr, timestamp);
         }
 

db/db.hh

@@ -105 +105 @@
                 }
 
-                void update_users_email(boost::shared_ptr<user> u,
-                                        std::string od, std::string nw) {
-                        boost::lock_guard<boost::recursive_mutex> lg(mt);
-                        if (users_email[od] == u) users_email[od].reset();
-                        users_email[nw] = u;
-                }
-
                 boost::shared_ptr<role> create_role(std::string name,
                                                     std::string description);
@@ -145 +138 @@
                 void do_article(db_detail::db_reader &, std::string);
                 void do_role(db_detail::db_reader &, std::string);
+                void read_record(db_detail::db_reader &dr,
+                                 boost::posix_time::ptime);
                 void register_role(boost::shared_ptr<role>);
         };

db/user.cc

@@ -70 +70 @@
                    << "\n";
                 dbase->add_record(os.str());
-                display_name = new_name;
+                BOOST_ASSERT(display_name == new_name);
         }
         void user::set_display_email(std::string new_addr)
@@ -82 +82 @@
                    << "\n";
                 dbase->add_record(os.str());
-                display_email = new_addr;
+                BOOST_ASSERT(display_email == new_addr);
         }
         bool user::set_delivery_email(std::string new_addr)
@@ -98 +98 @@
                    << "\n";
                 dbase->add_record(os.str());
-                dbase->update_users_email(shared_from_this(),
-                                          delivery_email,
-                                          new_addr);
-                delivery_email_verified = false;
-                delivery_email_cookie = token;
-                delivery_email = new_addr;
                 return true;
+                BOOST_ASSERT(delivery_email == new_addr);
+                BOOST_ASSERT(!delivery_email_verified);
+                BOOST_ASSERT(delivery_email_cookie == token);
         }
         void user::set_allow_cleartext_password(bool val)
@@ -116 +113 @@
                    << "\n";
                 dbase->add_record(os.str());
-                do_allow_cleartext_password = val;
+                BOOST_ASSERT(do_allow_cleartext_password == val);
         }
         void user::send_delivery_email_cookie(server::conn_cb cb,
@@ -131 +128 @@
                            << "\n";
                         dbase->add_record(os.str());
-                        delivery_email_cookie = token;
+                        BOOST_ASSERT(delivery_email_cookie == token);
                 }
                 std::string ton = display_name;
@@ -179 +176 @@
                    << "\n";
                 dbase->add_record(os.str());
-                delivery_email_verified = true;
+                BOOST_ASSERT(delivery_email_verified);
                 return true;
         }

db/user.hh

@@ -34 +34 @@
         class db;
         class role;
+
         class user : public boost::noncopyable
                    , public boost::enable_shared_from_this<user>