X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=615f1f041f90b50a41886121d516a11c8df72dea;hb=14cf4a18b7517a3f7e86ee3e756043a3431b87db;hp=58b4c96fca4079ea5d5dcc7c46e77fbc2d9de575;hpb=a56d83cfd745de68ef8ec4250c9ef6f9fe3ab776;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 58b4c96..615f1f0 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -8,16 +8,12 @@
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
-
-#ifdef _RELWITHDEBINFO
-#define new DEBUG_NEW
-#endif
-
-
+#include <creaImageIOGimmick.h>
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
 
+
 namespace creaImageIO
 {
   //==============================================================
@@ -36,6 +32,7 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
+
 	 if(mSettings!=0)
 	  {
 	  	mSettings->writeSettingsFile();
@@ -49,7 +46,7 @@ namespace creaImageIO
   //==============================================================
   
   //==============================================================
-  void Gimmick::Initialize(const std::string& i_namedescp, const std::string i_namedb)
+  void Gimmick::Initialize(const std::string i_namedescp, const std::string i_namedb)
   {
 	  mLocalDescpName = i_namedescp;
 	  mLocalDBName = i_namedb;
@@ -130,7 +127,8 @@ namespace creaImageIO
 	 else 
 	 {
 		/// Open and test it
-		GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
+		
+		GimmickDebugMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
         	if ( !sqlTreeH->Open(true) )
 		{
 			GimmickError("ERROR OPENING '"<<i_locDB<<"'");
@@ -201,7 +199,9 @@ namespace creaImageIO
     if (mLocalDatabasePath.size()==0) 
       {
 	mLocalDatabasePath = GetUserSettingsDirectory();
-	mLocalDatabasePath += "Shared/gimmick/local_database.sqlite3";
+	mLocalDatabasePath += "Shared/gimmick/";
+	mLocalDatabasePath += mLocalDBName;
+	mLocalDatabasePath +=".sqlite3";
 	boost::algorithm::replace_all( mLocalDatabasePath,
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
@@ -214,13 +214,34 @@ namespace creaImageIO
   //========================================================================
   void Gimmick::CreateUserSettingsDirectory()
   {
+	 // std::string st("C:/Documents and Settings/cervenansky/.gimmick/");
+	 // 	boost::algorithm::replace_all( st, 
+		//		       INVALID_FILE_SEPARATOR , 
+		//		       VALID_FILE_SEPARATOR);
+		//const boost::filesystem::path mpath(st);
+//C:\Documents and Settings\cervenansky\.gimmick");
+	  //if ( !boost::filesystem::exists( path ) ) 		  return ;
+	 //  boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end
+	 //  for ( boost::filesystem::directory_iterator itr( path );  itr != end_itr;  ++itr )
+	 // {
+		//// If is directory & recurse : do recurse
+		//	if ( boost::filesystem::is_directory(itr->status()) )
+		//	return;
+	 //  }
+
 	  //JCP settings dir 02/10/2009
 	  const std::string settingsdirectory = GetUserSettingsDirectory();
-	  bool isdir = boost::filesystem::is_directory( settingsdirectory );
+	  	//boost::algorithm::replace_all( mUserSettingsDirectory, 
+				//       INVALID_FILE_SEPARATOR , 
+				//       VALID_FILE_SEPARATOR);
+;//("E:\frederic");
+		  //("C:\\Documents and Settings\\cervenansky\\.gimmick\\"); // settingsdirectory );
+		bool isdir = false;
+	   isdir = boost::filesystem::is_directory(settingsdirectory); // settingsdirectory );
     if (! isdir )
       {
 	GimmickMessage(1,"Directory '"<<GetUserSettingsDirectory()<<"' "
-		       << "does not exist : creating it"<<std::endl);
+ 		       << "does not exist : creating it"<<std::endl);
 	
 	if ( ! boost::filesystem::create_directory( GetUserSettingsDirectory() ) )
 	  {