Changeset 7ccc366e52cc1e51e123b39fccaf56267361ca58

Timestamp:

08/25/10 18:30:39 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

43f521291669f483d361949fa6c886c0fbd94daf

Parents:

7eb42bed950e3f81ef9f0d39432e07c55f12cc22

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/25/10 18:30:39)

Message:

[db::db_reader] Move from db_detail

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

Location:

db

Files:

• db.cc (modified) (2 diffs)
• db.hh (modified) (3 diffs)
• db_reader.hh (added)
• illformed_db.hh (added)
• role_exists.hh (added)

db/db.cc

@@ -19 +19 @@
 
 #include "db.hh"
+#include "db_reader.hh"
 #include "role.hh"
+#include "role_exists.hh"
 #include "user.hh"
 #include "user_exists.hh"
@@ -33 +35 @@
 #include <fstream>
 
-// TODO: Decouple record parsing by an "event" mechanism.
-
-namespace db_detail
-{
-        class illformed_db : public std::exception
-        {
-                const std::string s;
-        public:
-                illformed_db(std::string s) : s("illformed db: " + s) {}
-                ~illformed_db() throw() {}
-                const char *what() const throw() { return s.c_str(); }
-        };
-
-        class role_exists : public std::exception
-        {
-                const std::string s;
-        public:
-                role_exists(std::string name) : s(name + " exists") {}
-                ~role_exists() throw() {}
-                const char *what() const throw() { return s.c_str(); }
-        };
-
-        class rollback {};
-
-        class db_reader : public boost::noncopyable
-        {
-                std::istream &dbfile;
-        public:
-                db_reader(std::istream &is) : dbfile(is) {}
-                void readline(std::string &line) {
-                        std::getline(dbfile, line);
-                        if (line.substr(0, 7) == ".BEGIN ") throw rollback();
-                }
-
-                std::string readline(std::string &line, std::string cmd){
-                        readline(line);
-                        util::strip(line);
-                        if (line.substr(0, cmd.length()+1) != cmd + " ")
-                                throw illformed_db(cmd + " missing");
-                        return line.substr(cmd.length()+1);
-                }
-
-                void endrec(std::string &line) {
-                        std::getline(dbfile, line);
-                        if (!dbfile || line.substr(0, 7) == ".BEGIN ") 
-                                throw rollback();
-                        util::strip(line);
-                        if (line != ".END") throw illformed_db(".END missing");
-                }
-                bool valid() { return dbfile; }
-        };
-
-}
-
 namespace db
 {
-        using namespace db_detail;
-
         db::db()
                 : dbname(config["db-file"].as<std::string>())

db/db.hh

@@ -37 +37 @@
 namespace msg { class msg; }
 
-namespace db_detail { class db_reader; }
-
 namespace db
 {
         class user;
         class password_handler;
+        class db_reader;
 
         class db : private boost::noncopyable
@@ -114 +113 @@
 
                 void add_record(std::string record);
-                
         private:
                 mutable boost::recursive_mutex mt;
@@ -133 +131 @@
                 boost::random_device rand;
 
-                void do_newgroup(db_detail::db_reader &, std::string,
+                void do_newgroup(db_reader &, std::string,
                                  boost::posix_time::ptime);
-                void do_user(db_detail::db_reader &, std::string);
-                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 do_user(db_reader &, std::string);
+                void do_article(db_reader &, std::string);
+                void do_role(db_reader &, std::string);
+                void read_record(db_reader &dr, boost::posix_time::ptime);
                 void register_role(boost::shared_ptr<role>);
         };