X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.h;h=4e7ec07efaeb9f3fa9a69685e572791105ea14f3;hb=e4a54c9026a2a0c17e3be0b5915c34688a9385ad;hp=b8e2ee8a8b37999d2df85ff8b7a5337ea6e87b71;hpb=d87a9f8f86d472c5ecaed70fa83f1e8a1024a450;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index b8e2ee8..4e7ec07 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -3,7 +3,6 @@
 
 #include <creaImageIOSQLiteTreeHandler.h>
 #include <creaImageIOTreeHandlerImageAdder.h>
-#include <creaImageIOTimestampDatabaseHandler.h>
 #include <creaImageIOSynchron.h>
 #include <creaImageIOSettings.h>
 
@@ -59,12 +58,14 @@ namespace creaImageIO
      void ConnectAddProgressObserver( AddProgressCallbackType callback )
     { mImageAdder.ConnectProgressObserver(callback); }
     
-
     ///
     const AddProgress& GetAddProgress() const { return mImageAdder.GetProgress(); }
 
-    /// Initialize (read/creates databases, etc.)
+    /// Initializes with default values (read/creates databases, etc.)
     void Initialize();
+
+	/// Initializes with the local database descriptor in the path given (read/creates databases, etc.)
+    void Initialize(const std::string& path);
     
     /// Finalize (closes databases, etc.)
     void Finalize();
@@ -81,8 +82,7 @@ namespace creaImageIO
     TreeHandlerMapType& GetTreeHandlerMap() { return mTreeHandlerMap; }
     /// Returns the TreeHandlerMap (const ref)
     const TreeHandlerMapType& GetTreeHandlerMap() const
-    { return mTreeHandlerMap; }
-    
+    { return mTreeHandlerMap; }    
 
     /// Add the files to the given TreeHandler
     void AddFiles(const std::string& handler,
@@ -116,15 +116,13 @@ namespace creaImageIO
 				const std::string &i_locDesc, 
 				const std::string &i_locDB);
 
-	// add an existent DB 
+	/// add an existent DB 
 	void addDB(const std::string &i_nameDB, const std::string &i_locationDB);
 
     /// Returns the TreeHandler with a given name
     TreeHandler* GetTreeHandler(const std::string& name) const;
 
-	/// Returns the TimestampDatabase
-	TimestampDatabaseHandler* GetTimestampDatabase() const;
-    /// 
+	/// 
     SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
 
     const SQLiteTreeHandler* GetLocalDatabase() const 
@@ -142,26 +140,30 @@ namespace creaImageIO
 	///Edits the field described by the name and key provided with the value given
 	void EditField(tree::Node* node, const std::string& d, const std::string& name, const std::string& key, const std::string& val);
 
+	/// Returns the attributes in results described in params
+	void GetAttributes(const std::string& d, 
+	  const std::string& filename, 
+	  const std::vector<std::string>& params, 
+	  std::vector<std::string>& results);
+  
     /// 
     const std::string& GetHomeDirectory();
     const std::string& GetUserSettingsDirectory();
     void CreateUserSettingsDirectory();
     const std::string& GetLocalDatabasePath();
-	const std::string& GetTimestampDatabasePath();
+	
 
 
     //=============================================
   private:
     SQLiteTreeHandler* mLocalDatabase;
-	TimestampDatabaseHandler* mTimestampDatabase;
-    TreeHandlerMapType mTreeHandlerMap;
+	TreeHandlerMapType mTreeHandlerMap;
 	Synchronizer* mSynchronizer;
 
     std::string mCurrentDirectory;
     std::string mHomeDirectory;
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
-	std::string mTimestampDatabasePath;
 	Settings	*mSettings;
     TreeHandlerImageAdder mImageAdder;
   };