Split up journal commits on multiple users.

1 files changed, 9 insertions, 20 deletions

diff --git a/server/src/journal.cc b/server/src/journal.cc
index b6638fd..b9f5c82 100644
--- a/server/src/journal.cc
+++ b/server/src/journal.cc
@@ -54,7 +54,7 @@ void Journal::addEntry(Transaction &transaction, Commit &commit,
   }
 
   if(entrylist.size() == 0) {
-    if(user() == "") setUser(transaction.user);
+    //if(user() == "") setUser(transaction.user);
     if(patientID() == "")setPatientID(transaction.cpr);
   }
 
@@ -70,20 +70,19 @@ void Journal::addEntry(Transaction &transaction, Commit &commit,
   }
 #endif
 
-  addEntry(resume, commit.macro, index);
+  addEntry(resume, commit.macro, transaction.user, index);
 }
 
-void Journal::addEntry(std::string resume, std::string macro, int index)
+void Journal::addEntry(std::string resume, std::string macro,
+                       std::string user, int index)
 {
-  // Strip trailing whitespace, and add newlines.
-  std::string r = resume;
-  std::string m = macro;
-
-  DEBUG(journal, "Add: %p %s - %s\n", this, m.c_str(), r.c_str());
+  DEBUG(journal, "Add: %p %s %s - %s\n", this, macro.c_str(),
+        user.c_str(), resume.c_str());
 
   ResumeEntry re;
-  re.resume = r;
-  re.macro = m;
+  re.resume = resume;
+  re.macro = macro;
+  re.user = user;
   re.dirty = false;
   entrylist[index] = re;
 }
@@ -138,16 +137,6 @@ bool Journal::dirty(std::string macro)
   }
   return false;
 }
-
-void Journal::setUser(std::string usr)
-{
-  _user = usr;
-}
-
-std::string Journal::user()
-{
-  return _user;
-}
   
 void Journal::setPatientID(std::string id)
 {