X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmick.cpp;h=5c7b07fd4fb9e36f366c64b8fef7176e69c73b34;hb=refs%2Ftags%2FCREATOOLS.2-0-3;hp=fcc38e076481bec00e4ecc3bc0f9144c49543e5c;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp index fcc38e0..5c7b07f 100644 --- a/src/creaImageIOGimmick.cpp +++ b/src/creaImageIOGimmick.cpp @@ -9,7 +9,7 @@ # define PATH_MAX 2048 #endif #include -#include + #ifdef _DEBUG #define new DEBUG_NEW #endif @@ -62,14 +62,14 @@ namespace creaImageIO CreateUserSettingsDirectory(); // Sets the current directory to the home dir mCurrentDirectory = GetHomeDirectory(); - mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/"); + mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/gimmick/"); mSettings = new Settings(mCurrentDirectory); std::string dbpath = GetLocalDatabasePath(); // Create or open local database - std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName; + std::string dpath= mCurrentDirectory + "/.gimmick/share/gimmick/" + mLocalDescpName; boost::algorithm::replace_all( dpath, INVALID_FILE_SEPARATOR , @@ -202,7 +202,7 @@ namespace creaImageIO if (mLocalDatabasePath.size()==0) { mLocalDatabasePath = GetUserSettingsDirectory(); - mLocalDatabasePath += "Shared/gimmick/"; + mLocalDatabasePath += "share/gimmick/"; mLocalDatabasePath += mLocalDBName; mLocalDatabasePath +=".sqlite3"; boost::algorithm::replace_all( mLocalDatabasePath, @@ -257,7 +257,7 @@ namespace creaImageIO boost::algorithm::replace_all( setDir, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - setDir+="Shared/"; + setDir+="share/"; boost::filesystem::create_directory( setDir ); setDir+="gimmick/"; boost::filesystem::create_directory( setDir ); @@ -277,7 +277,7 @@ namespace creaImageIO // The following stuff works on Linux, NOT CHECKED on Windows // JPR #if defined(_WIN32) - path+="/bin/Shared/gimmick/"; + path+="/bin/share/gimmick/"; #endif #if defined (LINUX) @@ -443,12 +443,10 @@ path+= mLocalDescpName; else { std::vector::iterator it = i_attr.inside.begin(); - for(; it != i_attr.inside.end(); it++) + for(; it != i_attr.inside.end(); it++) i_res[(*it)] = map_attr[(*it)]; } } - - }