X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmick.cpp;h=90dc2c8fcf716f2a088eaa543fce4bcc5c12f0e6;hb=cc5a912f64e8de1f90d9ef0956633515a46d31ae;hp=8d1583ccac4ddd4fd75b62d39535e32e8cd05e8f;hpb=66f2d68a504d06b45b4047bd7a445c11889b9fc0;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 8d1583c..90dc2c8 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -30,53 +30,112 @@ 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;
-    // 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
+	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
-    if (! boost::filesystem::exists( GetLocalDatabasePath() ) )
+    if (! boost::filesystem::exists( GetTimestampDatabasePath() ) )
       {
-	std::string mess = "Local database '";
-	mess += GetLocalDatabasePath();
+	std::string mess = "Timestamp database '";
+	mess += GetTimestampDatabasePath();
 	mess += "' does not exist : creating it";
 	GimmickMessage(1,mess<<std::endl);
 	
-	// CREATING DEFAULT DB STRUCTURE
-	mLocalDatabase->GetTree().GetDescriptor().CreateDefault();
-	
-	if ( ! mLocalDatabase->Create(true) )
+	if ( ! mTimestampDatabase->Create() )
 	  {
-	    GimmickError("ERROR CREATING '"<<GetLocalDatabasePath()<<"'");
+	    GimmickError("ERROR CREATING '"<<GetTimestampDatabasePath()<<"'");
 	  }
-	mLocalDatabase->SetAttribute(0,"Name","Local database");
-      }
+	
+     }
     else 
       {
 	/// Open and test it
-	GimmickMessage(1,"Opening local database '"
-		       <<GetLocalDatabasePath()<<"' "
+	GimmickMessage(1,"Opening Timestamp database '"
+		       <<GetTimestampDatabasePath()<<"' "
 		       <<std::endl);
-	if ( ! mLocalDatabase->Open(true) )
+	if ( ! mTimestampDatabase->Open() )
 	  {
-	    GimmickError("ERROR OPENING '"<<GetLocalDatabasePath()<<"'");
+	    GimmickError("ERROR OPENING '"<<GetTimestampDatabasePath()<<"'");
 	  }
 	
       }
+
+  }
+
+   ///////////////////////////////////////////////////////////////////////
+   // add DB to TreeHandler Map											//
+   // @param i_name : DB name										    //
+   // @param i_location : DB location								    //
+   // return : -														//
+  ///////////////////////////////////////////////////////////////////////
+	void Gimmick::addDB(std::string &i_name, std::string &i_location)
+	{
+		mTreeHandlerMap[i_name] = new SQLiteTreeHandler(i_location);
+	}
+
+ 
+  ///////////////////////////////////////////////////////////////////////////
+  // 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(std::string &i_name, std::string &i_locDesc, 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;
   }
   //==============================================================
 
@@ -132,6 +191,22 @@ namespace creaImageIO
       }
     return mLocalDatabasePath;    
   }
+
+  //================================================================
+
+  //================================================================
+  const std::string& Gimmick::GetTimestampDatabasePath()
+  {
+    if (mTimestampDatabasePath.size()==0) 
+      {
+	mTimestampDatabasePath = GetUserSettingsDirectory();
+	mTimestampDatabasePath += "timestamp_database.sqlite3";
+	boost::algorithm::replace_all( mTimestampDatabasePath,
+				       INVALID_FILE_SEPARATOR , 
+				       VALID_FILE_SEPARATOR);
+      }
+    return mTimestampDatabasePath;    
+  }
   //========================================================================
 
   //========================================================================
@@ -168,7 +243,7 @@ namespace creaImageIO
   //========================================================================
 
   //========================================================================
-  /// Add a file to the local database
+  /// Returns the tree handler with the given name
   TreeHandler* Gimmick::GetTreeHandler(const std::string& name) const 
   {  
     TreeHandlerMapType::const_iterator i;
@@ -180,6 +255,13 @@ namespace creaImageIO
     return i->second;
   }
 
+  //========================================================================
+  ///Returns the timestamp database handler
+  TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const 
+  {  
+    return mTimestampDatabase;
+  }
+
 
   //========================================================================
   /// Add the files to the tree handler
@@ -189,6 +271,7 @@ namespace creaImageIO
     GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
+	mImageAdder.SetTimestampHandler(mTimestampDatabase);
     mImageAdder.AddFiles(filenames);
 
   }
@@ -204,6 +287,7 @@ namespace creaImageIO
 
 	TreeHandler * handler=GetTreeHandler(d);
     mImageAdder.SetTreeHandler(handler);
+	mImageAdder.SetTimestampHandler(mTimestampDatabase);
     mImageAdder.AddDirectory(f,recurse);
 	//Synchronize(true, handler);