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

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 01e49bd..e38db81 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -30,48 +30,19 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Initialize()
   {
+	  std::string i_nameDB = "Local database";
     // Create the UserSettings dir if does not exist
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-	mSynchronizer=0;
+	mSynchronizer= new Synchronizer(GetUserSettingsDirectory());
 
-    // Create local database handler
-    mLocalDatabase = new SQLiteTreeHandler(GetLocalDatabasePath());
-    // Add it to the TreeHandlerMap
-    mTreeHandlerMap["Local database"] = mLocalDatabase;
+	std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
-    if (! boost::filesystem::exists( GetLocalDatabasePath() ) )
-      {
-	std::string mess = "Local database '";
-	mess += GetLocalDatabasePath();
-	mess += "' does not exist : creating it";
-	GimmickMessage(1,mess<<std::endl);
-	
-	// CREATING DEFAULT DB STRUCTURE
-//	mLocalDatabase->GetTree().GetDescriptor().CreateDefault();
-	mLocalDatabase->GetTree().GetDescriptor().createDescriptorfromFile(mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt");
-	
-	if ( ! mLocalDatabase->Create(true) )
-	  {
-	    GimmickError("ERROR CREATING '"<<GetLocalDatabasePath()<<"'");
-	  }
-	mLocalDatabase->SetAttribute(0,"Name","Local database");
-      }
-    else 
-      {
-	/// Open and test it
-	GimmickMessage(1,"Opening local database '"
-		       <<GetLocalDatabasePath()<<"' "
-		       <<std::endl);
-	if ( ! mLocalDatabase->Open(true) )
-	  {
-	    GimmickError("ERROR OPENING '"<<GetLocalDatabasePath()<<"'");
-	  }
-	
-      }
-
-
+	mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath);
+    // Add it to the TreeHandlerMap
+    mTreeHandlerMap[i_nameDB] = mLocalDatabase;
+    
 	// Creates files and directories database
     mTimestampDatabase = new TimestampDatabaseHandler(GetTimestampDatabasePath());
     // Create or open local database
@@ -102,13 +73,75 @@ namespace creaImageIO
       }
 
   }
-  //================================================================
+
+   ///////////////////////////////////////////////////////////////////////
+   // add DB to TreeHandler Map											//
+   // @param i_name : DB name										    //
+   // @param i_location : DB location								    //
+   // return : -														//
+  ///////////////////////////////////////////////////////////////////////
+	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);
+		}
+	}
+
+ 
+  ///////////////////////////////////////////////////////////////////////////
+  // create a DB from a attributes descriptor file for medical images      //
+  // @param i_name : DB name											   //
+  // @param i_locDesc : location of descriptor file						   //
+  // @param i_locDB : location of DB									   //
+  // return : the SQLiteTreeHandler object on DB						   //
+	/////////////////////////////////////////////////////////////////////////
+	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
+    if (! boost::filesystem::exists(i_locDB) )
+     {
+         std::string mess = "Local database '";
+         mess += i_locDB;
+         mess += "' does not exist : creating it";
+         GimmickMessage(1,mess<<std::endl);
+         
+		 // CREATING DB STRUCTURE
+         sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
+         if ( ! sqlTreeH->Create(true) )
+		 {
+			GimmickError("ERROR CREATING '"<<i_locDB<<"'");
+         }
+         sqlTreeH->SetAttribute(0,"Name",i_name);
+	 }
+	 else 
+	 {
+		/// Open and test it
+		GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
+        if ( !sqlTreeH->Open(true) )
+		{
+			GimmickError("ERROR OPENING '"<<i_locDB<<"'");
+		}
+      }
+	 return sqlTreeH;
+  }
 
 
   //==============================================================
   void Gimmick::Finalize()
   {
-    delete mLocalDatabase;
+	 
+	  // delete SQLiteTreeHandler Object
+	   for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
+           it!= mTreeHandlerMap.end(); ++it)
+	   {
+		   delete it->second;
+	   }
 	delete mTimestampDatabase;
   }
   //==============================================================
@@ -246,8 +279,9 @@ namespace creaImageIO
  
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	mImageAdder.SetSynchronizer(mSynchronizer);
     mImageAdder.AddFiles(filenames);
-
+	
   }
   //========================================================================
 
@@ -262,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);
   }
 
   //========================================================================