diff options
| -rw-r--r-- | server/src/macrotool_dump.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/src/macrotool_dump.cc b/server/src/macrotool_dump.cc index 920d4b6..3f9cfd7 100644 --- a/server/src/macrotool_dump.cc +++ b/server/src/macrotool_dump.cc @@ -71,14 +71,14 @@ static std::map<std::string, struct _macro> macroList() std::vector<std::string> macrofiles = getMacros(); std::vector<std::string>::iterator mfs = macrofiles.begin(); while(mfs != macrofiles.end()) { - std::string name = mfs->substr(0, mfs->length() - 4); + //std::string name = mfs->substr(0, mfs->length() - 4); MacroParser parser(Conf::xml_basedir + "/macros/" + *mfs); parser.parse(); Macro *macro = parser.getMacro(); - std::string key = name;// + macro->attributes["version"]; - macros[key].name = name; + std::string key = macro->attributes["name"];// + "-" + macro->attributes["version"]; + macros[key].name = macro->attributes["name"]; macros[key].file = *mfs; macros[key].title = macro->window.attributes["caption"]; macros[key].version = macro->attributes["version"]; @@ -134,7 +134,7 @@ static void dump_macros() printcolumn(ms->second.version, version_sz); printcolumn(ms->second.file, file_sz); printcolumn(ms->second.title, title_sz); - + std::set<std::string>::iterator ts = ms->second.templates.begin(); while(ts != ms->second.templates.end()) { if(ts != ms->second.templates.begin()) printf(", "); |