Add fix to entitylist, for mixing updates on dir rename/moves. Updated MacroList and TemplateList to macth new interface and use new insert method.

1 files changed, 4 insertions, 2 deletions

diff --git a/server/src/entitylist.h b/server/src/entitylist.h
index 9185f67..3bcdfd0 100644
--- a/server/src/entitylist.h
+++ b/server/src/entitylist.h
@@ -58,7 +58,7 @@ public:
    * @param entitypath A std::string containing the path in which we should look
    * for xml files.
    */
-  EntityList(std::string entityname);
+  EntityList(std::string entitypath, std::string entityname);
   virtual ~EntityList();
 
   /**
@@ -71,7 +71,8 @@ public:
   std::string getLatestVersion(std::string entity) throw(Exception);
 
 protected:
-  void rescan(std::string entitypath);
+  void rescan();
+  void insertEntity(std::string entity, std::string version, std::string file);
 
 private:
   virtual void addFile(std::string file) = 0;
@@ -84,6 +85,7 @@ private:
   INotify inotify;
   
   std::string entityname;
+  std::string entitypath;
 };
 
 #endif/*__PRACRO_ENTITYLIST_H__*/