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

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 5549175..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"
+//#include "io.h"
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
@@ -42,7 +42,6 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Initialize(const std::string& path)
   {
-	  mDescriptorPath=path;
 	  Initialize();
   }
 
@@ -72,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()<<"'");
-	  }
-	
-      }
-
   }
 
    ///////////////////////////////////////////////////////////////////////
@@ -172,7 +143,6 @@ namespace creaImageIO
 	   {
 		   delete it->second;
 	   }
-	delete mTimestampDatabase;
   }
   //==============================================================
 
@@ -230,21 +200,7 @@ 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;    
-  }
   //========================================================================
 
   //========================================================================
@@ -323,12 +279,6 @@ namespace creaImageIO
     return i->second;
   }
 
-  //========================================================================
-  ///Returns the timestamp database handler
-  TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const 
-  {  
-    return mTimestampDatabase;
-  }
 
 
   //========================================================================
@@ -340,9 +290,8 @@ namespace creaImageIO
  
 	mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddFiles(filenames);
+	mImageAdder.AddFiles(filenames);
 	
   }
   //========================================================================
@@ -358,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);  
   }
@@ -371,7 +319,6 @@ namespace creaImageIO
   {
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
-	  mTimestampDatabase->RemoveNode("PATH",node,d);
 	  mImageAdder.RemoveFile(node);
   }
   //========================================================================
@@ -383,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));
   }
@@ -395,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);
   }
@@ -424,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);
   }
@@ -447,7 +391,6 @@ namespace creaImageIO
 		   mImageAdder.SetTreeHandler(it->second);
 		   mImageAdder.DeleteDriveFromMainDB(drive);
 	   }
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
 	  mImageAdder.DeleteDriveFromOtherDB(drive);
   }