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

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 3aae8a8..de6b11d 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -3,6 +3,10 @@
 #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
 
 namespace creaImageIO
 {
@@ -35,58 +39,39 @@ namespace creaImageIO
   }
   //==============================================================
   
+  //==============================================================
+  void Gimmick::Initialize(const std::string& path)
+  {
+	  Initialize();
+  }
 
   //==============================================================
   void Gimmick::Initialize()
   {
-	  std::string i_nameDB = "Local database";
+	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= new Synchronizer(GetUserSettingsDirectory());
+	mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
 
 	mSettings  = new Settings(mCurrentDirectory);
 	
 
 	std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
-	mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath);
+	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);
     // 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()<<"'");
-	  }
-	
-      }
-
   }
 
    ///////////////////////////////////////////////////////////////////////
@@ -158,7 +143,6 @@ namespace creaImageIO
 	   {
 		   delete it->second;
 	   }
-	delete mTimestampDatabase;
   }
   //==============================================================
 
@@ -201,13 +185,14 @@ namespace creaImageIO
   }
   //================================================================
 
+
   //================================================================
   const std::string& Gimmick::GetLocalDatabasePath()
   {
     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);
@@ -215,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;    
-  }
   //========================================================================
 
   //========================================================================
@@ -245,6 +216,36 @@ namespace creaImageIO
 	    GimmickError("ERROR CREATING '"<<GetUserSettingsDirectory()<<"'");
 	  }
       }
+
+	std::string setDir=GetUserSettingsDirectory();
+	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(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("/"));
+		//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);
+		boost::filesystem::copy_file(path,setDir);
+	}
   }
   //========================================================================
 
@@ -278,12 +279,6 @@ namespace creaImageIO
     return i->second;
   }
 
-  //========================================================================
-  ///Returns the timestamp database handler
-  TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const 
-  {  
-    return mTimestampDatabase;
-  }
 
 
   //========================================================================
@@ -295,9 +290,8 @@ namespace creaImageIO
  
 	mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
-	mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddFiles(filenames);
+	mImageAdder.AddFiles(filenames);
 	
   }
   //========================================================================
@@ -313,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);  
   }
@@ -326,7 +319,6 @@ namespace creaImageIO
   {
 	  mImageAdder.SetCurrentDatabase(d);
 	  mImageAdder.SetSynchronizer(mSynchronizer);
-	  mTimestampDatabase->RemoveNode("PATH",node,d);
 	  mImageAdder.RemoveFile(node);
   }
   //========================================================================
@@ -338,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));
   }
@@ -350,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);
   }
@@ -371,6 +361,21 @@ namespace creaImageIO
 
   //========================================================================
 
+  void Gimmick::GetAttributes(const std::string& d, 
+	  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.SetSynchronizer(mSynchronizer);
+	  mImageAdder.GetAttributes(params, filename, results);
+  }
+  //========================================================================
+
+  //========================================================================
+
   void Gimmick::UpdateSetting(const std::string& name, const std::string& value)
   {
 	  mSettings->updateSetting(name,value);
@@ -386,11 +391,21 @@ namespace creaImageIO
 		   mImageAdder.SetTreeHandler(it->second);
 		   mImageAdder.DeleteDriveFromMainDB(drive);
 	   }
-	  mImageAdder.SetTimestampHandler(mTimestampDatabase);
 	  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);
+  }
+  //========================================================================
+
+
   /////////////////////////////////////////////////////////////////////////
   // add DB from Settings file										     //
   // @param : -															 //