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

8 files changed, 384 insertions, 346 deletions

diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 23fa367..26a14e2 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -26,6 +26,7 @@ pracrod_SOURCES = \
 	inotify.cc \
 	journal_commit.cc \
 	journal.cc \
+	journal_uploadserver.cc \
 	log.cc \
 	luaquerymapper.cc \
 	luaresume.cc \
@@ -106,6 +107,7 @@ EXTRA_DIST = \
 	inotify.h \
 	journal_commit.h \
 	journal.h \
+	journal_uploadserver.h \
 	log.h \
 	luaquerymapper.h \
 	luaresume.h \
diff --git a/server/src/journal.cc b/server/src/journal.cc
index f8e0af4..288f7c2 100644
--- a/server/src/journal.cc
+++ b/server/src/journal.cc
@@ -28,140 +28,11 @@
 #include "journal.h"
 
 #include "debug.h"
-#include "journal_commit.h"
 
-static inline bool iswhitespace(char c)
-{
-  return c == ' ' || c == '\n' || c == '\t' || c == '\r';
-}
-
-/**
- * Remove all spaces, tabs and newline trailing the string.
- */
-static std::string stripTrailingWhitepace(const std::string &str)
-{
-  if(str == "") return str;
-
-  ssize_t end = str.size() - 1;
-
-  while(end >= 0 && iswhitespace(str[end])) end--;
-  end++;
-
-  return str.substr(0, end);
-}
-
-static bool isInsideUTF8(const std::string &str, size_t idx)
-{
-  // Two byte character
-  if(idx > 0 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xE0) == 0xC0)
-    return true;
-
-  // Three byte character
-  if(idx > 1 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xC0 ) == 0x80 &&
-     (str[idx - 2] & 0xF0) == 0xE0)
-    return true;
-
-  if(idx > 0 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xF0) == 0xE0)
-    return true;
-
-  // Four byte character
-  if(idx > 2 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xC0 ) == 0x80 &&
-     (str[idx - 2] & 0xC0 ) == 0x80 &&
-     (str[idx - 3] & 0xF8) == 0xF0)
-    return true;
-
-  if(idx > 1 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xC0 ) == 0x80 &&
-     (str[idx - 2] & 0xF8) == 0xF0)
-    return true;
-
-  if(idx > 0 &&
-     (str[idx] & 0xC0 ) == 0x80 &&
-     (str[idx - 1] & 0xF8) == 0xF0)
-    return true;
-
-  return false;
-}
-
-static size_t UTF8Length(const std::string &str)
-{
-  size_t size = 0;
-  for(size_t i = 0; i < str.size(); i++) {
-    if(!isInsideUTF8(str, i)) size++;
-  }
-  return size;
-}
-
-/**
- * Find all lines longer than 'width', and insert a newline in the
- * first backward occurring space. Force split any lines without a space.
- */
-static std::string addNewlines(const std::string &str, size_t width)
-{
-  std::string output;
-  size_t len = 0;
-  for(size_t i = 0; i < str.size(); i++) {
-    char c = str[i];
-
-    /*
-    fprintf(stderr, "i: %d, char: '%c', width: %d, len: %d, output: '%s'\n",
-            i, c, width, len, output.c_str());
-    */
-
-    output += c;
-
-    if(isInsideUTF8(str, i)) continue;
-
-    len++;
-    if(c == '\n') len = 0;
-
-    // Try to split line at whitespace.
-    if(len > width) {
-      size_t p = 0;
-      while(p < width) {
-        p++;
-
-        size_t pos = output.size() - p;
-
-        if(isInsideUTF8(output, pos)) continue;
-
-        if(iswhitespace(output[pos])) {
-          output[pos] = '\n';
-          len = UTF8Length(output.substr(pos+1));
-          break;
-        }
-      }
-    }
-
-    // Force split line at current pos.
-    if(len > width) {
-      // replace last char with a newline, and append the character again, after the newline.
-      output[output.size()-1] = '\n';
-      output += c;
-      len = 1;
-    }
-  }
-
-  return output;
-}
-
-Journal::Journal(std::string host, unsigned short int port)
-{
-  this->host = host;
-  this->port = port;
-}
+Journal::Journal() {}
 
 void Journal::addEntry(Transaction &transaction, Commit &commit,
-                             std::string resume, Template *templ)
+                       std::string resume, Template *templ)
 {
   size_t index = 0;
   std::vector< Macro >::iterator i = templ->macros.begin();
@@ -178,38 +49,26 @@ void Journal::addEntry(Transaction &transaction, Commit &commit,
     //      return;
   } else {
     PRACRO_DEBUG(journal, "Found macro %s as index %u in template %s\n",
-                 commit.macro.c_str(), index, templ->attributes["name"].c_str());
+                 commit.macro.c_str(), index,
+                 templ->attributes["name"].c_str());
   }
 
-  // First run - initialize username and cpr.
-  if(currentuser == "" && entrylist.size() == 0) currentuser = transaction.user;
-  if(currentcpr == "" && entrylist.size() == 0) currentcpr = transaction.cpr;
-
-  PRACRO_DEBUG(journal, "addEntry: template(%s)\n", templ->attributes["name"].c_str());
-
-#if 0 // this feature is no longer nessecary...
-  // Add the template resume as the header (ie. first entry)
-  //  of the journal entry.
-  if(entrylist.size() == 0 && templ->attributes["name"] != "") {
-    std::string template_resume = templ->attributes["resume"];
-    
-    PRACRO_DEBUG(journal, "TemplateResume: %s\n", template_resume.c_str());
-    
-    if(template_resume != "") {
-      ResumeEntry re;
-      re.resume = template_resume;
-      re.macro = "template_header"; 
-      entrylist[-1] = re; // Make sure it comes first.
-    }
+  if(entrylist.size() == 0) {
+    if(user() == "") setUser(transaction.user);
+    if(patientID() == "")setPatientID(transaction.cpr);
   }
-#endif
+
+  PRACRO_DEBUG(journal, "addEntry: template(%s)\n",
+               templ->attributes["name"].c_str());
 
   // Test if the username or the cpr has changed... 
   // if so, commit and clear the list.
-  if(currentuser != transaction.user || currentcpr != transaction.cpr) {
+#if 0 // no - it breaks things...
+  if(user() != transaction.user || patientID() != transaction.cpr) {
     this->commit();
     entrylist.clear();
   }
+#endif
 
   addEntry(resume, commit.macro, index);
 }
@@ -226,27 +85,6 @@ void Journal::addEntry(std::string resume, std::string macro, int index)
   entrylist[index] = re;
 }
 
-void Journal::commit()
-{
-  std::string resume;
-  
-  // Iterate through all resumes, and create a string containing them all.
-  std::map< int, ResumeEntry >::iterator i = entrylist.begin();
-  while(i != entrylist.end()) {
-    if(resume != "") resume += "\n\n";
-    //    resume += i->macro + "\n";
-    resume += stripTrailingWhitepace(addNewlines(i->second.resume, 60));
-    i++;
-  }
-
-  if(resume == "") return;
-
-  // Connect to praxisuploadserver and commit all resumes in one bulk.
-  journal_commit(currentcpr.c_str(), currentuser.c_str(),
-                 host.c_str(), port,
-                 resume.c_str(), resume.size());
-}
-
 std::string Journal::getEntry(std::string macro)
 {
   std::map< int, ResumeEntry >::iterator i = entrylist.begin();
@@ -269,105 +107,26 @@ void Journal::removeEntry(std::string macro)
   }
 }
 
+void Journal::setUser(std::string usr)
+{
+  _user = usr;
+}
 
-#ifdef TEST_JOURNAL
-//deps: debug.cc journal_commit.cc
-//cflags: -I..
-//libs:
-#include "test.h"
-
-#define LONG "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\neiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.           \n\n    \t";
-
-TEST_BEGIN;
-
-TEST_EQUAL_STR(stripTrailingWhitepace
-               ("Lorem ipsum dolor sit amet.           \n\n    \t"),
-                "Lorem ipsum dolor sit amet.", "Test wspace remover.");
-
-TEST_EQUAL_STR(stripTrailingWhitepace(""), "", "Test wspace remover on empty string.");
-
-TEST_EQUAL_STR(stripTrailingWhitepace("\n\t "), "", "Test wspace remover on wspace-only string.");
-
-TEST_EQUAL_STR(stripTrailingWhitepace("\n"), "", "Test wspace remover on newline only.");
-TEST_EQUAL_STR(stripTrailingWhitepace("\t"), "", "Test wspace remover on tab only.");
-TEST_EQUAL_STR(stripTrailingWhitepace("\r"), "", "Test wspace remover on space only.");
-TEST_EQUAL_STR(stripTrailingWhitepace(" "), "", "Test wspace remover on space only.");
-
-TEST_EQUAL_STR(stripTrailingWhitepace("ø "), "ø", "Test wspace remover on utf-8 char.");
-TEST_EQUAL_STR(stripTrailingWhitepace("ø"), "ø", "Test wspace remover on utf-8 char only.");
-
-TEST_EQUAL_STR(stripTrailingWhitepace("a "), "a", "Test wspace remover on single char only.");
-TEST_EQUAL_STR(stripTrailingWhitepace("a"), "a", "Test wspace remover on single char only.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do.", 60),
-                "Lorem ipsum dolor sit amet, consectetur adipisicing elit,\nsed do.",
-               "Test single linesplit.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Lorem ipsum dolor sit amet, consectetur adipisicing elit, øsed do.", 60),
-                "Lorem ipsum dolor sit amet, consectetur adipisicing elit,\nøsed do.",
-               "Test single linesplit around utf-8 char.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Lorem ipsum dolor sit amet, consectetur adipisicing elitø, sed do.", 60),
-                "Lorem ipsum dolor sit amet, consectetur adipisicing elitø,\nsed do.",
-               "Test single linesplit around utf-8 char.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Lorem\nipsum dolor sit amet.", 12),
-                "Lorem\nipsum dolor\nsit amet.",
-               "Test single linesplit with contained newline.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Lorem ipsum dolor sitan met.", 11),
-                "Lorem ipsum\ndolor sitan\nmet.",
-               "Test single linesplit on exact border.");
-
-TEST_EQUAL_STR(addNewlines
-               ("Loremipsum", 6),
-                "Loremi\npsum",
-               "Test single linesplit inside word.");
-
-TEST_EQUAL_STR(addNewlines
-               ("abc Loremipsum", 6),
-                "abc\nLoremi\npsum",
-               "Test single linesplit inside word.");
-
-TEST_TRUE(isInsideUTF8("ø", 1), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aæb", 2), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aøb", 2), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aåb", 2), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aÆb", 2), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aØb", 2), "Test positive utf8 match.");
-TEST_TRUE(isInsideUTF8("aÅb", 2), "Test positive utf8 match.");
-TEST_FALSE(isInsideUTF8("ø", 0), "Test negative utf8 match.");
-TEST_FALSE(isInsideUTF8("aæøb", 3), "Test negative utf8 match (between two utf8 chars).");
-TEST_FALSE(isInsideUTF8("aøb", 0), "Test negative utf8 match (before utf8 char).");
-
-TEST_FALSE(isInsideUTF8("𤭢", 0), "Test positive utf8 match, len 4.");
-TEST_TRUE(isInsideUTF8("𤭢", 1), "Test positive utf8 match, len 4.");
-TEST_TRUE(isInsideUTF8("𤭢", 2), "Test positive utf8 match, len 4.");
-TEST_TRUE(isInsideUTF8("𤭢", 3), "Test positive utf8 match, len 4.");
-
-TEST_FALSE(isInsideUTF8("€", 0), "Test positive utf8 match, len 3.");
-TEST_TRUE(isInsideUTF8("€", 1), "Test positive utf8 match, len 3.");
-TEST_TRUE(isInsideUTF8("€", 2), "Test positive utf8 match, len 3.");
-
-TEST_FALSE(isInsideUTF8("¢", 0), "Test positive utf8 match, len 2.");
-TEST_TRUE(isInsideUTF8("¢", 1), "Test positive utf8 match, len 2.");
-
-TEST_EQUAL_INT(UTF8Length("ø"), 1, "Test utf8 string length.");
-TEST_EQUAL_INT(UTF8Length("æø"), 2, "Test utf8 string length.");
-TEST_EQUAL_INT(UTF8Length(""), 0, "Test utf8 string length.");
-TEST_EQUAL_INT(UTF8Length("a"), 1, "Test utf8 string length.");
-TEST_EQUAL_INT(UTF8Length("aø"), 2, "Test utf8 string length.");
-TEST_EQUAL_INT(UTF8Length("aøb"), 3, "Test utf8 string length.");
-
-TEST_EQUAL_INT(UTF8Length("a𤭢€¢ø𤭢€¢øa"), 10, "Test utf8 string length, combi.");
+std::string Journal::user()
+{
+  return _user;
+}
+  
+void Journal::setPatientID(std::string id)
+{
+  _patientid = id;
+}
 
-TEST_EQUAL_STR(stripTrailingWhitepace(addNewlines("", 60)), "", "Test on empty input.");
+std::string Journal::patientID()
+{
+  return _patientid;
+}
 
-TEST_END;
+#ifdef TEST_JOURNAL
 
 #endif/*TEST_JOURNAL*/
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;
 };
 
diff --git a/server/src/journal_commit.cc b/server/src/journal_commit.cc
index 56e7baf..9d76c8f 100644
--- a/server/src/journal_commit.cc
+++ b/server/src/journal_commit.cc
@@ -52,66 +52,6 @@
 #include "template.h"
 #include "templateparser.h"
 
-#if 0
-static inline bool iswhitespace(char c)
-{
-  return c == ' ' || c == '\n' || c == '\t';
-}
-
-/**
- * Remove all spaces, tabs and newline trailing the string.
- */
-static std::string stripTrailingWhitepace(std::string str)
-{
-  if(str == "") return str;
-
-  ssize_t end = str.size() - 1;
-
-  while(end && iswhitespace(str[end]) 
-        && (end>0 && str[end-1] & 0x80) == false // Make sure we are not in a utf8 character.
-        ) {
-    end--;
-  }
-  end++;
-
-  return str.substr(0, end);
-}
-
-/**
- * Find all lines longer than 'width', and insert a newline in the
- * first backward occurring space.
- */
-static std::string addNewlines(std::string str, size_t width)
-{
-  std::string output;
-
-  std::string fraction;
-  size_t linelen = 0;
-  for(size_t i = 0; i < str.size(); i++) {
-
-    fraction += str[i];
-
-    if(iswhitespace(str[i]) 
-       && (i>0 && str[i-1] & 0x80) == false // Make sure we are not in a utf8 character.
-       ) {
-      if(linelen + fraction.size() > width) {
-        output[output.size() - 1] = '\n';
-        linelen = 0;
-      }
-      output += fraction;
-      linelen += fraction.size();
-      fraction = "";
-    }
-
-    if(str[i] == '\n') linelen = 0;
-
-  }
-  output += fraction;
-
-  return output;
-}
-#endif
-
 static int mwrite(int sock, const char *fmt, ...)
 {
   int l = 0;
@@ -125,7 +65,8 @@ static int mwrite(int sock, const char *fmt, ...)
   va_end(args);
   
   if(sock != -1 && write(sock, buffer, l) != l) {
-    PRACRO_ERR_LOG(journal, "write did not write all the bytes in the buffer.\n");
+    PRACRO_ERR_LOG(journal,
+                   "write did not write all the bytes in the buffer.\n");
   }
  
   PRACRO_DEBUG(journal, "%s", buffer);
@@ -173,6 +114,8 @@ int journal_commit(const char *cpr, const char *user,
     perror(":");
     return -1;
   }
+#else
+  sock = open("/tmp/pracro_journal.log", O_CREAT | O_WRONLY | O_TRUNC);
 #endif/*WITHOUT_UPLOADSERVER*/
 
   // send header
diff --git a/server/src/journal_uploadserver.cc b/server/src/journal_uploadserver.cc
new file mode 100644
index 0000000..ce88f02
--- /dev/null
+++ b/server/src/journal_uploadserver.cc
@@ -0,0 +1,285 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set et sw=2 ts=2: */
+/***************************************************************************
+ *            journal_uploadserver.cc
+ *
+ *  Mon Jun 21 12:55:38 CEST 2010
+ *  Copyright 2010 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of Pracro.
+ *
+ *  Pracro is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Pracro is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Pracro; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "journal_uploadserver.h"
+
+#include "journal_commit.h"
+
+static inline bool iswhitespace(char c)
+{
+  return c == ' ' || c == '\n' || c == '\t' || c == '\r';
+}
+
+/**
+ * Remove all spaces, tabs and newline trailing the string.
+ */
+static std::string stripTrailingWhitepace(const std::string &str)
+{
+  if(str == "") return str;
+
+  ssize_t end = str.size() - 1;
+
+  while(end >= 0 && iswhitespace(str[end])) end--;
+  end++;
+
+  return str.substr(0, end);
+}
+
+static bool isInsideUTF8(const std::string &str, size_t idx)
+{
+  // Two byte character
+  if(idx > 0 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xE0) == 0xC0)
+    return true;
+
+  // Three byte character
+  if(idx > 1 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xC0) == 0x80 &&
+     (str[idx - 2] & 0xF0) == 0xE0)
+    return true;
+
+  if(idx > 0 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xF0) == 0xE0)
+    return true;
+
+  // Four byte character
+  if(idx > 2 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xC0) == 0x80 &&
+     (str[idx - 2] & 0xC0) == 0x80 &&
+     (str[idx - 3] & 0xF8) == 0xF0)
+    return true;
+
+  if(idx > 1 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xC0) == 0x80 &&
+     (str[idx - 2] & 0xF8) == 0xF0)
+    return true;
+
+  if(idx > 0 &&
+     (str[idx] & 0xC0) == 0x80 &&
+     (str[idx - 1] & 0xF8) == 0xF0)
+    return true;
+
+  return false;
+}
+
+static size_t UTF8Length(const std::string &str)
+{
+  size_t size = 0;
+  for(size_t i = 0; i < str.size(); i++) {
+    if(!isInsideUTF8(str, i)) size++;
+  }
+  return size;
+}
+
+/**
+ * Find all lines longer than 'width', and insert a newline in the
+ * first backward occurring space. Force split any lines without a space.
+ */
+static std::string addNewlines(const std::string &str, size_t width)
+{
+  std::string output;
+  size_t len = 0;
+  for(size_t i = 0; i < str.size(); i++) {
+    char c = str[i];
+
+    /*
+    fprintf(stderr, "i: %d, char: '%c', width: %d, len: %d, output: '%s'\n",
+            i, c, width, len, output.c_str());
+    */
+
+    output += c;
+
+    if(isInsideUTF8(str, i)) continue;
+
+    len++;
+    if(c == '\n') len = 0;
+
+    // Try to split line at whitespace.
+    if(len > width) {
+      size_t p = 0;
+      while(p < width) {
+        p++;
+
+        size_t pos = output.size() - p;
+
+        if(isInsideUTF8(output, pos)) continue;
+
+        if(iswhitespace(output[pos])) {
+          output[pos] = '\n';
+          len = UTF8Length(output.substr(pos+1));
+          break;
+        }
+      }
+    }
+
+    // Force split line at current pos.
+    if(len > width) {
+      // replace last char with a newline, and append the character again, after the newline.
+      output[output.size()-1] = '\n';
+      output += c;
+      len = 1;
+    }
+  }
+
+  return output;
+}
+
+JournalUploadServer::JournalUploadServer(std::string host,
+                                         unsigned short int port)
+{
+  this->host = host;
+  this->port = port;
+}
+
+void JournalUploadServer::commit()
+{
+  std::string resume;
+  
+  // Iterate through all resumes, and create a string containing them all.
+  std::map< int, ResumeEntry >::iterator i = entrylist.begin();
+  while(i != entrylist.end()) {
+    if(resume != "") resume += "\n\n";
+    //    resume += i->macro + "\n";
+    resume += stripTrailingWhitepace(addNewlines(i->second.resume, 60));
+    i++;
+  }
+
+  if(resume == "") return;
+
+  // Connect to praxisuploadserver and commit all resumes in one bulk.
+  journal_commit(patientID().c_str(), user().c_str(),
+                 host.c_str(), port,
+                 resume.c_str(), resume.size());
+}
+
+
+#ifdef TEST_JOURNAL_UPLOADSERVER
+//deps: debug.cc journal_commit.cc
+//cflags: -I..
+//libs:
+#include "test.h"
+
+#define LONG "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\neiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.           \n\n    \t";
+
+TEST_BEGIN;
+
+TEST_EQUAL_STR(stripTrailingWhitepace
+               ("Lorem ipsum dolor sit amet.           \n\n    \t"),
+                "Lorem ipsum dolor sit amet.", "Test wspace remover.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace(""), "", "Test wspace remover on empty string.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace("\n\t "), "", "Test wspace remover on wspace-only string.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace("\n"), "", "Test wspace remover on newline only.");
+TEST_EQUAL_STR(stripTrailingWhitepace("\t"), "", "Test wspace remover on tab only.");
+TEST_EQUAL_STR(stripTrailingWhitepace("\r"), "", "Test wspace remover on space only.");
+TEST_EQUAL_STR(stripTrailingWhitepace(" "), "", "Test wspace remover on space only.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace("ø "), "ø", "Test wspace remover on utf-8 char.");
+TEST_EQUAL_STR(stripTrailingWhitepace("ø"), "ø", "Test wspace remover on utf-8 char only.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace("a "), "a", "Test wspace remover on single char only.");
+TEST_EQUAL_STR(stripTrailingWhitepace("a"), "a", "Test wspace remover on single char only.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do.", 60),
+                "Lorem ipsum dolor sit amet, consectetur adipisicing elit,\nsed do.",
+               "Test single linesplit.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Lorem ipsum dolor sit amet, consectetur adipisicing elit, øsed do.", 60),
+                "Lorem ipsum dolor sit amet, consectetur adipisicing elit,\nøsed do.",
+               "Test single linesplit around utf-8 char.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Lorem ipsum dolor sit amet, consectetur adipisicing elitø, sed do.", 60),
+                "Lorem ipsum dolor sit amet, consectetur adipisicing elitø,\nsed do.",
+               "Test single linesplit around utf-8 char.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Lorem\nipsum dolor sit amet.", 12),
+                "Lorem\nipsum dolor\nsit amet.",
+               "Test single linesplit with contained newline.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Lorem ipsum dolor sitan met.", 11),
+                "Lorem ipsum\ndolor sitan\nmet.",
+               "Test single linesplit on exact border.");
+
+TEST_EQUAL_STR(addNewlines
+               ("Loremipsum", 6),
+                "Loremi\npsum",
+               "Test single linesplit inside word.");
+
+TEST_EQUAL_STR(addNewlines
+               ("abc Loremipsum", 6),
+                "abc\nLoremi\npsum",
+               "Test single linesplit inside word.");
+
+TEST_TRUE(isInsideUTF8("ø", 1), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aæb", 2), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aøb", 2), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aåb", 2), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aÆb", 2), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aØb", 2), "Test positive utf8 match.");
+TEST_TRUE(isInsideUTF8("aÅb", 2), "Test positive utf8 match.");
+TEST_FALSE(isInsideUTF8("ø", 0), "Test negative utf8 match.");
+TEST_FALSE(isInsideUTF8("aæøb", 3), "Test negative utf8 match (between two utf8 chars).");
+TEST_FALSE(isInsideUTF8("aøb", 0), "Test negative utf8 match (before utf8 char).");
+
+TEST_FALSE(isInsideUTF8("𤭢", 0), "Test positive utf8 match, len 4.");
+TEST_TRUE(isInsideUTF8("𤭢", 1), "Test positive utf8 match, len 4.");
+TEST_TRUE(isInsideUTF8("𤭢", 2), "Test positive utf8 match, len 4.");
+TEST_TRUE(isInsideUTF8("𤭢", 3), "Test positive utf8 match, len 4.");
+
+TEST_FALSE(isInsideUTF8("€", 0), "Test positive utf8 match, len 3.");
+TEST_TRUE(isInsideUTF8("€", 1), "Test positive utf8 match, len 3.");
+TEST_TRUE(isInsideUTF8("€", 2), "Test positive utf8 match, len 3.");
+
+TEST_FALSE(isInsideUTF8("¢", 0), "Test positive utf8 match, len 2.");
+TEST_TRUE(isInsideUTF8("¢", 1), "Test positive utf8 match, len 2.");
+
+TEST_EQUAL_INT(UTF8Length("ø"), 1, "Test utf8 string length.");
+TEST_EQUAL_INT(UTF8Length("æø"), 2, "Test utf8 string length.");
+TEST_EQUAL_INT(UTF8Length(""), 0, "Test utf8 string length.");
+TEST_EQUAL_INT(UTF8Length("a"), 1, "Test utf8 string length.");
+TEST_EQUAL_INT(UTF8Length("aø"), 2, "Test utf8 string length.");
+TEST_EQUAL_INT(UTF8Length("aøb"), 3, "Test utf8 string length.");
+
+TEST_EQUAL_INT(UTF8Length("a𤭢€¢ø𤭢€¢øa"), 10, "Test utf8 string length, combi.");
+
+TEST_EQUAL_STR(stripTrailingWhitepace(addNewlines("", 60)), "", "Test on empty input.");
+
+TEST_END;
+
+#endif/*TEST_JOURNAL_UPLOADSERVER*/
diff --git a/server/src/journal_uploadserver.h b/server/src/journal_uploadserver.h
new file mode 100644
index 0000000..2393709
--- /dev/null
+++ b/server/src/journal_uploadserver.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set et sw=2 ts=2: */
+/***************************************************************************
+ *            journal_uploadserver.h
+ *
+ *  Mon Jun 21 12:55:38 CEST 2010
+ *  Copyright 2010 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of Pracro.
+ *
+ *  Pracro is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Pracro is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Pracro; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __PRACRO_JOURNAL_UPLOADSERVER_H__
+#define __PRACRO_JOURNAL_UPLOADSERVER_H__
+
+#include "journal.h"
+
+class JournalUploadServer : public Journal {
+public:
+  JournalUploadServer(std::string host, unsigned short int port);
+  void commit();
+
+private:
+  std::string host;
+  unsigned short int port;
+};
+
+#endif/*__PRACRO_JOURNAL_UPLOADSERVER_H__*/
diff --git a/server/src/session.cc b/server/src/session.cc
index 31be81b..700f370 100644
--- a/server/src/session.cc
+++ b/server/src/session.cc
@@ -36,6 +36,8 @@
 #include <errno.h>
 
 #include "journal.h"
+#include "journal_uploadserver.h"
+
 #include "database.h"
 #include "configuration.h"
 #include "connectionpool.h"
@@ -100,7 +102,8 @@ Journal *Session::journal()
 {
   if(_journal == NULL) {
    _journal =
-      new Journal(Conf::journal_commit_addr, Conf::journal_commit_port);
+      new JournalUploadServer(Conf::journal_commit_addr,
+                              Conf::journal_commit_port);
   }
   return _journal;
 }
diff --git a/server/src/sessionserialiser.cc b/server/src/sessionserialiser.cc
index 9b5e393..9706d22 100644
--- a/server/src/sessionserialiser.cc
+++ b/server/src/sessionserialiser.cc
@@ -67,8 +67,8 @@ void SessionSerialiser::loadStr(const std::string &xml)
   parser.parse(xml.data(), xml.length());
 
   Journal *j = session->journal();
-  j->currentuser = XDEC(parser.userid);
-  j->currentcpr = XDEC(parser.patientid);
+  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);
@@ -90,8 +90,8 @@ std::string SessionSerialiser::saveStr()
 
   Journal *journal = session->journal();
 
-  xml += "  <journal patientid=\"" + XENC(journal->currentcpr) +
-    "\" userid=\"" + XENC(journal->currentuser) + "\">\n";
+  xml += "  <journal patientid=\"" + XENC(journal->patientID()) +
+    "\" userid=\"" + XENC(journal->user()) + "\">\n";
 
   std::map< int, Journal::ResumeEntry >::iterator i =
     journal->entrylist.begin();