New database layout.

1 files changed, 12 insertions, 10 deletions

diff --git a/server/src/pracrodaopgsql.h b/server/src/pracrodaopgsql.h
index e15a22b..e3664f9 100644
--- a/server/src/pracrodaopgsql.h
+++ b/server/src/pracrodaopgsql.h
@@ -44,15 +44,19 @@ public:
                  std::string _user, std::string _passwd, std::string _dbname);
   ~PracroDAOPgsql();
 
-  void commitTransaction(Transaction &transaction,
+  std::string newSessionId();
+  void commitTransaction(std::string sessionid,
+                         Transaction &transaction,
                          Commit &commit,
                          Macro &macro,
                          time_t now);
-  Values getLatestValues(std::string patientid,
+  Values getLatestValues(std::string sessionid,
+                         std::string patientid,
                          Macro *macro,
                          Fieldnames &fieldnames,
                          time_t oldest);
-  unsigned nrOfCommits(std::string patientid,
+  unsigned nrOfCommits(std::string sessionid,
+                       std::string patientid,
                        std::string macroname,
                        time_t oldest);
 
@@ -60,16 +64,14 @@ public:
   void delFieldname(std::string name);
   std::vector<Fieldname> getFieldnames();
 
-  void commit();
-  void discard();
-  std::string serialise();
-  void restore(const std::string &data);
+  void commit(std::string sessionid);
+  void nocommit(std::string sessionid);
+  void discard(std::string sessionid);
+  std::string serialise() { return ""; }
+  void restore(const std::string &data) {}
 
 private:
   pqxx::connection  *conn;
-  pqxx::work *W;
-  
-  std::string statements;
 };
 
 #endif/*WITHOUT_DB*/