X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=e168c3769baa12b10a85243a77011076f39a6e81;hb=a67d921cdc10d438852b48c2985f14d91320e016;hp=55491754e15f980b53cee48b2a8f74a4b178d0f2;hpb=60067c5195c2aff6e7de8faef1cecf25f32802e4;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 5549175..e168c37 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -1,40 +1,42 @@
+
 #include <creaImageIOGimmick.h>
 
 #include <creaImageIOSystem.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include "io.h"
+//#include "io.h"
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
 namespace creaImageIO
 {
-
-
   //==============================================================
   Gimmick::Gimmick()
     : mImageAdder(0)
   {    
-    RegisterGimmickMessageTypes();
+  RegisterGimmickMessageTypes();
 	mSettings=0;
 	mSynchronizer=0;
   }
   //==============================================================
 
 
-
   //==============================================================
   Gimmick::~Gimmick()
   {
 	 if(mSettings!=0)
 	  {
-	  mSettings->writeSettingsFile();
-      delete mSettings;
+	  	mSettings->writeSettingsFile();
+		delete mSettings;
 	  }
-	  if(mSynchronizer!=0)
+	if(mSynchronizer!=0)
 	  {
-	  delete mSynchronizer;
+	  	delete mSynchronizer;
 	  }
   }
   //==============================================================
@@ -42,7 +44,6 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Initialize(const std::string& path)
   {
-	  mDescriptorPath=path;
 	  Initialize();
   }
 
@@ -54,63 +55,32 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-	mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
+    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
 
-	mSettings  = new Settings(mCurrentDirectory);
+    mSettings  = new Settings(mCurrentDirectory);
 	
-
-	std::string dbpath = GetLocalDatabasePath();
+    std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
-	std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.txt";
-	boost::algorithm::replace_all( dpath,
-				       INVALID_FILE_SEPARATOR , 
-				       VALID_FILE_SEPARATOR);
-	mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
+    std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp";
+    boost::algorithm::replace_all( dpath,
+				   INVALID_FILE_SEPARATOR , 
+				   VALID_FILE_SEPARATOR);
+    mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
     // 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
-    if (! boost::filesystem::exists( GetTimestampDatabasePath() ) )
-      {
-	std::string mess = "Timestamp database '";
-	mess += GetTimestampDatabasePath();
-	mess += "' does not exist : creating it";
-	GimmickMessage(1,mess<<std::endl);
-	
-	if ( ! mTimestampDatabase->Create() )
-	  {
-	    GimmickError("ERROR CREATING '"<<GetTimestampDatabasePath()<<"'");
-	  }
-	
-     }
-    else 
-      {
-	/// Open and test it
-	GimmickMessage(1,"Opening Timestamp database '"
-		       <<GetTimestampDatabasePath()<<"' "
-		       <<std::endl);
-	if ( ! mTimestampDatabase->Open() )
-	  {
-	    GimmickError("ERROR OPENING '"<<GetTimestampDatabasePath()<<"'");
-	  }
-	
-      }
-
+    //Add additional DB from user Settings
+    addDBSettings();	
   }
 
    ///////////////////////////////////////////////////////////////////////
-   // 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)
+   // 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())
 		{
@@ -120,7 +90,6 @@ namespace creaImageIO
 		}
 	}
 
- 
   ///////////////////////////////////////////////////////////////////////////
   // create a DB from a attributes descriptor file for medical images      //
   // @param i_name : DB name											   //
@@ -128,11 +97,11 @@ namespace creaImageIO
   // @param i_locDB : location of DB									   //
   // return : the SQLiteTreeHandler object on DB						   //
 	/////////////////////////////////////////////////////////////////////////
-	SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name,
+	SQLiteTreeHandler* Gimmick::createDB(const std::string &i_name,
 					     const std::string &i_locDesc,
 					     const std::string &i_locDB)
   {
-      SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB);
+     SQLiteTreeHandler* sqlTreeH( new SQLiteTreeHandler(i_locDB) );
     // Create or open local database
     if (! boost::filesystem::exists(i_locDB) )
      {
@@ -144,8 +113,8 @@ namespace creaImageIO
 		 // CREATING DB STRUCTURE
          sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
          if ( ! sqlTreeH->Create(true) )
-		 {
-			GimmickError("ERROR CREATING '"<<i_locDB<<"'");
+	 {
+		GimmickError("ERROR CREATING '"<<i_locDB<<"'");
          }
          sqlTreeH->SetAttribute(0,"Name",i_name);
 	 }
@@ -153,26 +122,25 @@ namespace creaImageIO
 	 {
 		/// Open and test it
 		GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
-        if ( !sqlTreeH->Open(true) )
+        	if ( !sqlTreeH->Open(true) )
 		{
 			GimmickError("ERROR OPENING '"<<i_locDB<<"'");
 		}
-      }
-	 return sqlTreeH;
+	}
+	return sqlTreeH;
   }
 
-
   //==============================================================
   void Gimmick::Finalize()
   {
 	 
 	  // delete SQLiteTreeHandler Object
 	   for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
-           it!= mTreeHandlerMap.end(); ++it)
+                                                   it!= mTreeHandlerMap.end(); 
+						   ++it)
 	   {
 		   delete it->second;
 	   }
-	delete mTimestampDatabase;
   }
   //==============================================================
 
@@ -230,21 +198,6 @@ namespace creaImageIO
     return mLocalDatabasePath;    
   }
 
-  //================================================================
-
-  //================================================================
-  const std::string& Gimmick::GetTimestampDatabasePath()
-  {
-    if (mTimestampDatabasePath.size()==0) 
-      {
-	mTimestampDatabasePath = GetUserSettingsDirectory();
-	mTimestampDatabasePath += "Shared/gimmick/timestamp_database.sqlite3";
-	boost::algorithm::replace_all( mTimestampDatabasePath,
-				       INVALID_FILE_SEPARATOR , 
-				       VALID_FILE_SEPARATOR);
-      }
-    return mTimestampDatabasePath;    
-  }
   //========================================================================
 
   //========================================================================
@@ -269,7 +222,7 @@ namespace creaImageIO
 	boost::filesystem::create_directory( setDir );
 	setDir+="gimmick/";
 	boost::filesystem::create_directory( setDir );
-	setDir+="localdatabase_Descriptor.txt";
+	setDir+="localdatabase_Descriptor.dscp";
 
 	if(!boost::filesystem::is_regular(setDir))
 	{
@@ -282,10 +235,17 @@ namespace creaImageIO
 		path=path.substr(0,path.size()-1);
 		path=path.substr(0,path.find_last_of("/"));
 		//Creating directories
-		path+="/bin/Shared/gimmick/localdatabase_Descriptor.txt";
-		std::cout<<"From: "<<path<<std::endl;
-		std::cout<<"To: "<<setDir<<std::endl;
-		boost::algorithm::replace_all( path,
+
+// The following stuff works on Linux, NOT CHECKED on Windows // JPR
+		
+#if defined(_WIN32)		
+		path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";
+#else		
+		path+="/Shared/gimmick/localdatabase_Descriptor.dscp";
+#endif		
+		std::cout <<"From: " << path   <<std::endl;
+		std::cout <<"To: "   << setDir <<std::endl;
+		boost::algorithm::replace_all(	path,
 						INVALID_FILE_SEPARATOR , 
 						VALID_FILE_SEPARATOR);
 		boost::filesystem::copy_file(path,setDir);
@@ -323,14 +283,6 @@ namespace creaImageIO
     return i->second;
   }
 
-  //========================================================================
-  ///Returns the timestamp database handler
-  TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const 
-  {  
-    return mTimestampDatabase;
-  }
-
-
   //========================================================================
   /// Add the files to the tree handler
   void Gimmick::AddFiles(const std::string& d, 
@@ -339,11 +291,9 @@ namespace creaImageIO
     GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
 	mImageAdder.SetCurrentDatabase(d);
-    mImageAdder.SetTreeHandler(GetTreeHandler(d));
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddFiles(filenames);
-	
+	mImageAdder.AddFiles(filenames);	
   }
   //========================================================================
 
@@ -352,15 +302,14 @@ namespace creaImageIO
   void Gimmick::AddDir(const std::string& d, const std::string& f, 
 		       bool recurse)
   {
-    GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
-		   <<recurse<<std::endl);
+	GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
+		  	 <<recurse<<std::endl);
 
 	TreeHandler * handler=GetTreeHandler(d);
 	mImageAdder.SetCurrentDatabase(d);
-    mImageAdder.SetTreeHandler(handler);
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
+	mImageAdder.SetTreeHandler(handler);
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddDirectory(f,recurse);  
+	mImageAdder.AddDirectory(f,recurse);  
   }
 
   //========================================================================
@@ -371,7 +320,6 @@ namespace creaImageIO
   {
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
-	  mTimestampDatabase->RemoveNode("PATH",node,d);
 	  mImageAdder.RemoveFile(node);
   }
   //========================================================================
@@ -383,7 +331,6 @@ namespace creaImageIO
 	  TreeHandler * handler=GetTreeHandler(d);
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetTreeHandler(handler);
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  mImageAdder.CopyFiles(filenames, mSettings->getValue(SETTINGS_COPY_PATH));
   }
@@ -395,7 +342,6 @@ namespace creaImageIO
 	  TreeHandler * handler=GetTreeHandler(d);
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetTreeHandler(handler);
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  return mImageAdder.Synchronize(repair, checkAttributes);
   }
@@ -410,21 +356,20 @@ namespace creaImageIO
 
   void Gimmick::GetSetting(const std::string& name, std::string& value)
   {
-	  value = mSettings->getValue(name);
+    value = mSettings->getValue(name);
   }
   //========================================================================
 
   //========================================================================
 
   void Gimmick::GetAttributes(const std::string& d, 
-	  const std::string& filename, 
-	  const std::vector<std::string>& params, 
-	  std::vector<std::string>& results)
+	  		const std::string& filename, 
+	  		const std::vector<std::string>& params, 
+	  		std::vector<std::string>& results)
   {
 	  TreeHandler * handler=GetTreeHandler(d);
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetTreeHandler(handler);
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  mImageAdder.GetAttributes(params, filename, results);
   }
@@ -441,33 +386,32 @@ namespace creaImageIO
 
   void Gimmick::DeleteDrive(const std::string& drive)
   {
-	  for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
-           it!= mTreeHandlerMap.end(); ++it)
+	for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
+					       it!= mTreeHandlerMap.end(); 
+					       ++it)
 	   {
 		   mImageAdder.SetTreeHandler(it->second);
 		   mImageAdder.DeleteDriveFromMainDB(drive);
 	   }
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
-	  mImageAdder.SetSynchronizer(mSynchronizer);
-	  mImageAdder.DeleteDriveFromOtherDB(drive);
+	mImageAdder.SetSynchronizer(mSynchronizer);
+	mImageAdder.DeleteDriveFromOtherDB(drive);
   }
 
   //========================================================================
   void Gimmick::EditField(tree::Node* node, const std::string& d, const std::string& name, const std::string& key, const std::string& val)
   {
-	  TreeHandler * handler=GetTreeHandler(d);
-	  mImageAdder.SetCurrentDatabase(d);
-	  mImageAdder.SetTreeHandler(handler);
-	  mImageAdder.EditField(node,name,key,val);
+	TreeHandler * handler=GetTreeHandler(d);
+	mImageAdder.SetCurrentDatabase(d);
+	mImageAdder.SetTreeHandler(handler);
+	mImageAdder.EditField(node,name,key,val);
   }
   //========================================================================
 
-
-  /////////////////////////////////////////////////////////////////////////
-  // add DB from Settings file										     //
-  // @param : -															 //
-  // return : -															 //
-  /////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////
+  // add DB from Settings file						//
+  // @param : -								//
+  // return : -								//
+  ////////////////////////////////////////////////////////////////////////
   void Gimmick::addDBSettings()
   {
 
@@ -494,7 +438,5 @@ namespace creaImageIO
 		 std::string name = it_path->substr(pos +1, last_pos -pos-1 );
 		 addDB(name, it_path->c_str());
 	 }
-
-  }
-	
+  }	
 }