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, 5 insertions, 6 deletions

diff --git a/server/src/macrotool/filehandler.cc b/server/src/macrotool/filehandler.cc
index 3c80a1c..738b687 100644
--- a/server/src/macrotool/filehandler.cc
+++ b/server/src/macrotool/filehandler.cc
@@ -74,11 +74,11 @@ static bool check(std::string file, std::string *name, std::string *version)
     }
 
     printf("Parsing of %s was succesful.\n", file.c_str());
-    printf("Name:    %s\n", macro->attributes["name"].c_str());
-    printf("Version: %s\n", macro->attributes["version"].c_str());
+    printf("Name:    %s\n", macro->name.c_str());
+    printf("Version: %s\n", macro->version.c_str());
 
-    if(name) *name = macro->attributes["name"];
-    if(version) *version = macro->attributes["version"];
+    if(name) *name = macro->name;
+    if(version) *version = macro->version;
 
   } catch( std::exception &e ) {
     printf("%s\n", e.what());
@@ -102,8 +102,7 @@ static bool macro_exists(std::string name, std::string version, std::string &cla
     parser.parse();
     Macro *macro = parser.getMacro();
 
-    if(name == macro->attributes["name"] &&
-       version == macro->attributes["version"]) {
+    if(name == macro->name && version == macro->version) {
       clashfile = *mfs;
       return true;
     }