Improved Storage APIs and moved debug code to unit tests.

1 files changed, 22 insertions, 18 deletions

diff --git a/src/dalstorage.h b/src/dalstorage.h
index 59a3eb3b..78a689c7 100644
--- a/src/dalstorage.h
+++ b/src/dalstorage.h
@@ -51,6 +51,20 @@ class DALStorage: public Storage
 
     public:
         /**
+         * Connect to the database and initialize it if necessary.
+         */
+        void
+        open(void);
+
+
+        /**
+         * Disconnect from the database.
+         */
+        void
+        close(void);
+
+
+        /**
          * Get an account by user name.
          *
          * @param userName the owner of the account.
@@ -67,23 +81,23 @@ class DALStorage: public Storage
          * @param account the new account.
          */
         void
-        addAccount(const Account* account);
+        addAccount(Account* account);
 
 
         /**
-         * Save changes to the database permanently.
+         * Delete an account.
+         *
+         * @param userName the owner of the account.
          */
         void
-        flush(void);
+        delAccount(const std::string& userName);
 
 
         /**
-         * Get the number of Accounts saved in database (test function).
-         *
-         * @return the number of Accounts.
+         * Save changes to the database permanently.
          */
-        unsigned int
-        getAccountCount(void);
+        void
+        flush(void);
 
 
     private:
@@ -114,13 +128,6 @@ class DALStorage: public Storage
 
 
         /**
-         * Connect to the database and initialize it if necessary.
-         */
-        void
-        connect(void);
-
-
-        /**
          * Create the specified table.
          *
          * @param tblName the table name.
@@ -135,9 +142,6 @@ class DALStorage: public Storage
 
     private:
         std::auto_ptr<dal::DataProvider> mDb; /**< the data provider */
-        typedef std::vector<Account*> Accounts;
-        Accounts mAccounts;                   /**< the loaded accounts */
-        Beings mCharacters;                   /**< the loaded characters */
 };