Split up journal commits on multiple users.

1 files changed, 10 insertions, 10 deletions

diff --git a/server/src/sessionserialiser.cc b/server/src/sessionserialiser.cc
index b9e825a..36d0a0d 100644
--- a/server/src/sessionserialiser.cc
+++ b/server/src/sessionserialiser.cc
@@ -84,11 +84,11 @@ Session *SessionSerialiser::loadStr(const std::string &xml)
                                  XDEC(parser.templ));
   session->isreadonly = parser.status == "readonly";
   Journal *j = session->journal();
-  j->setUser(XDEC(parser.userid));
+  //  j->setUser(XDEC(parser.userid));
   j->setPatientID(XDEC(parser.patientid));
   std::vector<SessionParser::Entry>::iterator i = parser.entries.begin();
   while(i != parser.entries.end()) {
-    j->addEntry(XDEC(i->resume), xml_decode(i->macro), i->index);
+    j->addEntry(XDEC(i->resume), XDEC(i->macro), XDEC(i->user), i->index);
     i++;
   }
 
@@ -104,23 +104,23 @@ std::string SessionSerialiser::saveStr(Session *session)
   std::string xml;
 
   xml += "<?xml version='1.0' encoding='UTF-8'?>\n";
-  xml += "<session timestamp=\""+itostr(time(NULL))+"\" "
-    "status=\"" + XENC(session->isreadonly?"readonly":"") + "\" "
-    "id=\""+XENC(session->id())+"\" "
-    "template=\""+XENC(session->templ)+ "\" "
-    "patientid=\"" + XENC(session->patientid) + "\">\n";
+  xml += "<session timestamp=\"" + itostr(time(NULL)) + "\""
+    " status=\"" + XENC(session->isreadonly?"readonly":"") + "\""
+    " id=\"" + XENC(session->id()) + "\""
+    " template=\"" + XENC(session->templ) + "\""
+    " patientid=\"" + XENC(session->patientid) + "\">\n";
 
   Journal *journal = session->journal();
 
-  xml += "  <journal patientid=\"" + XENC(journal->patientID()) +
-    "\" userid=\"" + XENC(journal->user()) + "\">\n";
+  xml += "  <journal patientid=\"" + XENC(journal->patientID()) + "\">\n";
 
   std::map< int, Journal::ResumeEntry >::iterator i =
     journal->entrylist.begin();
   while(i != journal->entrylist.end()) {
 
     xml += "    <entry index=\""+itostr(i->first) + "\""
-      " macro=\"" + i->second.macro + "\">\n";
+      " macro=\"" + XENC(i->second.macro) + "\""
+      " user=\"" + XENC(i->second.user) + "\">\n";
     xml += "      <resume>" + XENC(i->second.resume) + "</resume>\n";
     xml += "    </entry>\n";