summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2009-07-30 09:03:05 +0000
committerdeva <deva>2009-07-30 09:03:05 +0000
commit706e18fae5713e070d6379f1ec9da1757b338f4e (patch)
tree16ff8f6a82d2e7933cd2e98f3740d8aa5c0178a2
parent55b2679028f1dbdf62af3f15b46cb4a208a5fd6f (diff)
Fixed macrotool macro/template dumper to work with the new TemplateParser.
-rw-r--r--server/src/macrotool_dump.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/server/src/macrotool_dump.cc b/server/src/macrotool_dump.cc
index 990d247..d108e54 100644
--- a/server/src/macrotool_dump.cc
+++ b/server/src/macrotool_dump.cc
@@ -90,7 +90,7 @@ static std::map<std::string, struct _macro> macroList()
std::vector<std::string>::iterator tfs = templatefiles.begin();
while(tfs != templatefiles.end()) {
std::string templ = tfs->substr(0, tfs->length() - 4);
- TemplateParser parser(templ);
+ TemplateParser parser(Conf::xml_basedir + "/templates/" + *tfs);
parser.parse();
Template *t = parser.getTemplate();
std::vector<Macro>::iterator ms = t->macros.begin();
@@ -154,8 +154,7 @@ static std::map<std::string, struct _template> templateList()
std::vector<std::string> templatefiles = getTemplates();
std::vector<std::string>::iterator tfs = templatefiles.begin();
while(tfs != templatefiles.end()) {
- std::string templ = tfs->substr(0, tfs->length() - 4);
- TemplateParser parser(templ);
+ TemplateParser parser(Conf::xml_basedir + "/templates/" + *tfs);
parser.parse();
Template *t = parser.getTemplate();