X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=e38db81ff628e90f987f3ef3296925a079665bf7;hb=9f8b288b5f8f56bc58fd01ddcb687833eb5ffa5b;hp=a9080fd328223dfed6d5ac365a98c2483a065d16;hpb=4e686df72aa8d0c59509195d173fd37acbd636b1;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index a9080fd..e38db81 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -35,7 +35,7 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-	mSynchronizer=0;
+	mSynchronizer= new Synchronizer(GetUserSettingsDirectory());
 
 	std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
@@ -80,7 +80,8 @@ namespace creaImageIO
    // @param i_location : DB location								    //
    // return : -														//
   ///////////////////////////////////////////////////////////////////////
-	void Gimmick::addDB(std::string &i_name, std::string &i_location)
+	void Gimmick::addDB(const std::string &i_name, 
+			    const std::string &i_location)
 	{
 		if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end())
 		{
@@ -97,7 +98,9 @@ namespace creaImageIO
   // @param i_locDB : location of DB									   //
   // return : the SQLiteTreeHandler object on DB						   //
 	/////////////////////////////////////////////////////////////////////////
-	SQLiteTreeHandler *Gimmick::createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB)
+	SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name,
+					     const std::string &i_locDesc,
+					     const std::string &i_locDB)
   {
       SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB);
     // Create or open local database
@@ -276,8 +279,9 @@ namespace creaImageIO
  
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	mImageAdder.SetSynchronizer(mSynchronizer);
     mImageAdder.AddFiles(filenames);
-
+	
   }
   //========================================================================
 
@@ -292,28 +296,31 @@ namespace creaImageIO
 	TreeHandler * handler=GetTreeHandler(d);
     mImageAdder.SetTreeHandler(handler);
 	mImageAdder.SetTimestampHandler(mTimestampDatabase);
-    mImageAdder.AddDirectory(f,recurse);
-	//Synchronize(true, handler);
-    
+	mImageAdder.SetSynchronizer(mSynchronizer);
+    mImageAdder.AddDirectory(f,recurse);  
   }
 
   //========================================================================
 
   //========================================================================
- 
-  void Gimmick::Synchronize(bool update, TreeHandler* handler)
+  void Gimmick::RemoveFile(const std::string& d, 
+			   tree::Node* node)
   {
-	  GimmickMessage(4,"Synchronizing. Update:"<<update<<std::endl);
-	  if(mSynchronizer==0)
-	  {
-		  mSynchronizer=new Synchronizer(handler);
-	  }
-	  else
-	  {
-		  mSynchronizer->SetTreeHandler(handler);
-	  }
-	  mSynchronizer->Synchronize(update);
+	  mImageAdder.SetSynchronizer(mSynchronizer);
+	  mTimestampDatabase->RemoveNode("PATH",node);
+	  mImageAdder.RemoveFile(node);
+  }
+  //========================================================================
 
+  //========================================================================
+ 
+  std::string Gimmick::Synchronize(bool repair, bool checkAttributes)
+  {
+	  TreeHandler * handler=GetTreeHandler("Local database");
+	  mImageAdder.SetTreeHandler(handler);
+	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	  mImageAdder.SetSynchronizer(mSynchronizer);
+	  return mImageAdder.Synchronize(repair, checkAttributes);
   }
 
   //========================================================================