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

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index a9080fd..b30fbc1 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -1,7 +1,6 @@
 #include <creaImageIOGimmick.h>
 
 #include <creaImageIOSystem.h>
-
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -22,7 +21,9 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
-    
+	  mSettings->writeSettingsFile();
+      delete mSettings;
+	  delete mSynchronizer;
   }
   //==============================================================
   
@@ -35,7 +36,10 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-	mSynchronizer=0;
+	mSynchronizer= new Synchronizer(GetUserSettingsDirectory());
+
+	mSettings  = new Settings(mCurrentDirectory);
+	
 
 	std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
@@ -43,6 +47,9 @@ namespace creaImageIO
     // Add it to the TreeHandlerMap
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
     
+	//Add additional DB from user Settings
+	addDBSettings();
+
 	// Creates files and directories database
     mTimestampDatabase = new TimestampDatabaseHandler(GetTimestampDatabasePath());
     // Create or open local database
@@ -80,12 +87,14 @@ 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())
 		{
 			mTreeHandlerMap[i_name] = new SQLiteTreeHandler(i_location);
 			mTreeHandlerMap[i_name]->Open(true);
+			mSettings->addDB(i_location);
 		}
 	}
 
@@ -97,7 +106,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 +287,9 @@ namespace creaImageIO
  
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	mImageAdder.SetSynchronizer(mSynchronizer);
     mImageAdder.AddFiles(filenames);
-
+	
   }
   //========================================================================
 
@@ -292,28 +304,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);
   }
 
   //========================================================================
@@ -323,6 +338,38 @@ namespace creaImageIO
     GetTreeHandler(d)->GetTree().Print();
   }
   //========================================================================
+  /////////////////////////////////////////////////////////////////////////
+  // add DB from Settings file										     //
+  // @param : -															 //
+  // return : -															 //
+  /////////////////////////////////////////////////////////////////////////
+  void Gimmick::addDBSettings()
+  {
 
+	 std::string pathSettings = mSettings->getValue(SETTINGS_DBPATH);
+	 
+	 // split to find all paths
+	 std::vector<std::string> paths;
+	 std::string separator = ";";
+	 std::string::size_type last_pos = pathSettings.find_first_not_of(separator);
+	 //find first separator
+	 std::string::size_type pos = pathSettings.find_first_of(separator, last_pos);
+	 while(std::string::npos != pos || std::string::npos != last_pos)
+	 {
+		paths.push_back(pathSettings.substr(last_pos, pos - last_pos));
+		last_pos = pathSettings.find_first_not_of(separator, pos);
+		pos = pathSettings.find_first_of(separator, last_pos);
+	 }
+
+	 std::vector<std::string>::iterator it_path = paths.begin();
+	 for(; it_path != paths.end(); ++it_path)
+	 {
+		 pos = it_path->find_last_of("\\");
+		 last_pos = it_path->find_last_of(".");
+		 std::string name = it_path->substr(pos +1, last_pos -pos-1 );
+		 addDB(name, it_path->c_str());
+	 }
 
+  }
+	
 }