X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=de6b11dd169ea626d5255a2a64b5f2813607ad10;hb=5970066f11bb2288cc7dc9fe173051c2a343789d;hp=5aa2c105cb4b5985cdc797719bd622403cd3038b;hpb=049d06a2d0d1fdc3713cf0f2a5f7a37cf6c4d9a2;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 5aa2c10..de6b11d 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -3,7 +3,7 @@
 #include <creaImageIOSystem.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-
+//#include "io.h"
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
@@ -39,6 +39,11 @@ namespace creaImageIO
   }
   //==============================================================
   
+  //==============================================================
+  void Gimmick::Initialize(const std::string& path)
+  {
+	  Initialize();
+  }
 
   //==============================================================
   void Gimmick::Initialize()
@@ -48,14 +53,14 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-	mSynchronizer= new Synchronizer(GetUserSettingsDirectory());
+	mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
 
 	mSettings  = new Settings(mCurrentDirectory);
 	
 
 	std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
-	std::string dpath= mCurrentDirectory + "/.gimmick/localdatabase_Descriptor.txt";
+	std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.txt";
 	boost::algorithm::replace_all( dpath,
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
@@ -66,35 +71,7 @@ namespace creaImageIO
 	//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()<<"'");
-	  }
-	
-      }
-
   }
 
    ///////////////////////////////////////////////////////////////////////
@@ -166,7 +143,6 @@ namespace creaImageIO
 	   {
 		   delete it->second;
 	   }
-	delete mTimestampDatabase;
   }
   //==============================================================
 
@@ -216,7 +192,7 @@ namespace creaImageIO
     if (mLocalDatabasePath.size()==0) 
       {
 	mLocalDatabasePath = GetUserSettingsDirectory();
-	mLocalDatabasePath += "local_database.sqlite3";
+	mLocalDatabasePath += "Shared/gimmick/local_database.sqlite3";
 	boost::algorithm::replace_all( mLocalDatabasePath,
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
@@ -224,21 +200,7 @@ 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;    
-  }
   //========================================================================
 
   //========================================================================
@@ -259,18 +221,26 @@ namespace creaImageIO
 	boost::algorithm::replace_all( setDir,
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
+	setDir+="Shared/";
+	boost::filesystem::create_directory( setDir );
+	setDir+="gimmick/";
+	boost::filesystem::create_directory( setDir );
 	setDir+="localdatabase_Descriptor.txt";
-	//if(!boost::filesystem::is_regular_file(setDir))  //JPRX
+
 	if(!boost::filesystem::is_regular(setDir))
 	{
 		char name[PATH_MAX];
 //EED		int err = GetBinaryDirectory(name, PATH_MAX);
 		crea::System::GetAppPath(name,PATH_MAX);
+		std::cout<<name<<std::endl;
 		
 		std::string path=name;
 		path=path.substr(0,path.size()-1);
 		path=path.substr(0,path.find_last_of("/"));
-		path+="/data/localdatabase_Descriptor.txt";
+		//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,
 						INVALID_FILE_SEPARATOR , 
 						VALID_FILE_SEPARATOR);
@@ -309,12 +279,6 @@ namespace creaImageIO
     return i->second;
   }
 
-  //========================================================================
-  ///Returns the timestamp database handler
-  TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const 
-  {  
-    return mTimestampDatabase;
-  }
 
 
   //========================================================================
@@ -326,9 +290,8 @@ namespace creaImageIO
  
 	mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddFiles(filenames);
+	mImageAdder.AddFiles(filenames);
 	
   }
   //========================================================================
@@ -344,7 +307,6 @@ namespace creaImageIO
 	TreeHandler * handler=GetTreeHandler(d);
 	mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(handler);
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	mImageAdder.SetSynchronizer(mSynchronizer);
     mImageAdder.AddDirectory(f,recurse);  
   }
@@ -357,7 +319,6 @@ namespace creaImageIO
   {
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
-	  mTimestampDatabase->RemoveNode("PATH",node,d);
 	  mImageAdder.RemoveFile(node);
   }
   //========================================================================
@@ -369,7 +330,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));
   }
@@ -381,7 +341,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,7 +369,6 @@ namespace creaImageIO
 	  TreeHandler * handler=GetTreeHandler(d);
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetTreeHandler(handler);
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  mImageAdder.GetAttributes(params, filename, results);
   }
@@ -433,7 +391,6 @@ namespace creaImageIO
 		   mImageAdder.SetTreeHandler(it->second);
 		   mImageAdder.DeleteDriveFromMainDB(drive);
 	   }
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  mImageAdder.DeleteDriveFromOtherDB(drive);
   }