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, 4 insertions, 4 deletions

diff --git a/server/src/journal.cc b/server/src/journal.cc
index b9f5c82..c38246f 100644
--- a/server/src/journal.cc
+++ b/server/src/journal.cc
@@ -38,19 +38,19 @@ void Journal::addEntry(Transaction &transaction, Commit &commit,
   std::vector< Macro >::iterator i = templ->macros.begin();
   while(i != templ->macros.end()) {
     Macro &m = *i;
-    if(commit.macro == m.attributes["name"]) break;
+    if(commit.macro == m.name) break;
     index++;
     i++;
   }
 
   if(index >= templ->macros.size()) {
     ERR(journal, "Could not find macro %s in template %s\n",
-        commit.macro.c_str(), templ->attributes["name"].c_str());
+        commit.macro.c_str(), templ->name.c_str());
     //      return;
   } else {
     DEBUG(journal, "Found macro %s as index %u in template %s\n",
           commit.macro.c_str(), index,
-          templ->attributes["name"].c_str());
+          templ->name.c_str());
   }
 
   if(entrylist.size() == 0) {
@@ -59,7 +59,7 @@ void Journal::addEntry(Transaction &transaction, Commit &commit,
   }
 
   DEBUG(journal, "addEntry: template(%s)\n",
-        templ->attributes["name"].c_str());
+        templ->name.c_str());
 
   // Test if the username or the cpr has changed... 
   // if so, commit and clear the list.