From 706e18fae5713e070d6379f1ec9da1757b338f4e Mon Sep 17 00:00:00 2001 From: deva Date: Thu, 30 Jul 2009 09:03:05 +0000 Subject: Fixed macrotool macro/template dumper to work with the new TemplateParser. --- server/src/macrotool_dump.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'server') 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 macroList() std::vector::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::iterator ms = t->macros.begin(); @@ -154,8 +154,7 @@ static std::map templateList() std::vector templatefiles = getTemplates(); std::vector::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(); -- cgit v1.2.3