removed macrotool.

add lua wrapper for praxisd.
new type attributes_t for sax parser and children.
make macros/templates use real vars instead of var map.
add data ttl on macro level.
add 'important' attribute to macrotags in templates.

1 files changed, 11 insertions, 12 deletions

diff --git a/server/src/sessionparser.cc b/server/src/sessionparser.cc
index 17cc4fb..6b3653e 100644
--- a/server/src/sessionparser.cc
+++ b/server/src/sessionparser.cc
@@ -54,33 +54,32 @@ void SessionParser::characterData(std::string &data)
   }
 }
 
-void SessionParser::startTag(std::string name,
-                             std::map<std::string, std::string> attributes)
+void SessionParser::startTag(std::string name, attributes_t &attr)
 {
   DEBUG(sessionparser, "<%s>\n", name.c_str());
 
   if(name == "session") {
-    patientid = attributes["patientid"];
-    sessionid = attributes["id"];
-    templ = attributes["template"];
-    status = attributes["status"];
+    patientid = attr["patientid"];
+    sessionid = attr["id"];
+    templ = attr["template"];
+    status = attr["status"];
   }
 
   if(name == "journal") {
-    //    patientid = attributes["patientid"];
-    //    userid = attributes["userid"];
+    //    patientid = attr["patientid"];
+    //    userid = attr["userid"];
   }
 
   if(name == "database") {
-    dbtype = attributes["type"];
+    dbtype = attr["type"];
     indatabase = true;
   }
 
   if(name == "entry") {
     Entry e;
-    e.index = atoi(attributes["index"].c_str());
-    e.macro = attributes["macro"];
-    e.user = attributes["user"];
+    e.index = atoi(attr["index"].c_str());
+    e.macro = attr["macro"];
+    e.user = attr["user"];
     entries.push_back(e);
   }