From e1d4c1224c0e1abce1d8cae49e241b37f1ca3eed Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 15 Jan 2010 10:43:59 +0000
Subject: Add fix to entitylist, for mixing updates on dir rename/moves.
 Updated MacroList and TemplateList to macth new interface and use new insert
 method.

---
 server/src/macrolist.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'server/src/macrolist.cc')

diff --git a/server/src/macrolist.cc b/server/src/macrolist.cc
index 9dadb12..954149a 100644
--- a/server/src/macrolist.cc
+++ b/server/src/macrolist.cc
@@ -34,9 +34,9 @@
 #include "debug.h"
 
 MacroList::MacroList(std::string path)
-  : EntityList("macro")
+  : EntityList(path, "macro")
 {
-  rescan(path);
+  rescan();
 }
 
 
@@ -47,8 +47,9 @@ void MacroList::addFile(std::string file)
   try {
     parser.parse();
     Macro *macro = parser.getMacro();
-    std::pair<VersionStr, std::string> p(VersionStr(macro->attributes["version"]), file);
-    (*this)[macro->attributes["name"]].insert(p);
+    insertEntity(macro->attributes["name"],
+                 macro->attributes["version"],
+                 file);
   } catch(Exception &e) {
     PRACRO_WARN(macrolist, "Skipping %s: %s\n", file.c_str(), e.what());
   }
-- 
cgit v1.2.3