Split journal code into modules. Fix bug, when user is changed in the middle of an active session.

1 files changed, 11 insertions, 8 deletions

diff --git a/server/src/journal.h b/server/src/journal.h
index 1ba258d..5a4cb99 100644
--- a/server/src/journal.h
+++ b/server/src/journal.h
@@ -39,31 +39,34 @@ class SessionSerialiser;
 class Journal {
   friend class SessionSerialiser;
 public:
-  Journal(std::string host, unsigned short int port);
+  Journal();
 
   void addEntry(Transaction &transaction, Commit &commit,
                 std::string resume, Template *templ);
 
   void addEntry(std::string resume, std::string macro, int index);
 
-  void commit();
+  virtual void commit() = 0;
 
   std::string getEntry(std::string macro);
   void removeEntry(std::string macro);
 
-private:
-  std::string host;
-  unsigned short int port;
-
-  std::string currentuser;
-  std::string currentcpr;
+  void setUser(std::string user);
+  std::string user();
+  
+  void setPatientID(std::string id);
+  std::string patientID();
 
+protected:
   class ResumeEntry {
   public:
     std::string resume;
     std::string macro;
   };
 
+  std::string _user;
+  std::string _patientid;
+
   std::map< int, ResumeEntry > entrylist;
 };