From dd1fb6e16ff777d3e098076d1015c6c565b51bb7 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 25 Nov 2011 11:59:37 +0100 Subject: Reuse environment (macrolist) instead of creating a new one. Add 'to' and 'from' times to export, both unixtimestamps. --- server/src/fieldnamescanner.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/src/fieldnamescanner.cc') diff --git a/server/src/fieldnamescanner.cc b/server/src/fieldnamescanner.cc index 5418bb4..ba3b61f 100644 --- a/server/src/fieldnamescanner.cc +++ b/server/src/fieldnamescanner.cc @@ -58,12 +58,12 @@ fieldnames_t getFields(Widget &widget) return fieldnames; } -templates_t scanfieldnames(std::set &filter) +templates_t scanfieldnames(Environment &env, std::set &filter) { templates_t templates; // TemplateList templatelist(Conf::xml_basedir + "/templates"); - MacroList macrolist(Conf::xml_basedir + "/macros"); + // MacroList macrolist(Conf::xml_basedir + "/macros"); // Iterate templates: std::vector templatefiles = getTemplates(); @@ -83,7 +83,7 @@ templates_t scanfieldnames(std::set &filter) if(ms->isHeader == false) { std::string macro = ms->name; DEBUG(scanner, "Name '%s'\n", macro.c_str()); - std::string macrofile = macrolist.getLatestVersion(macro); + std::string macrofile = env.macrolist.getLatestVersion(macro); DEBUG(scanner, "File '%s'\n", macrofile.c_str()); // Iterate fields: -- cgit v1.2.3