X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FcreaImageIOGimmick.cpp;h=c473a330082381b73fa714e384d9e20769740579;hb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;hp=06e32ce55a89c81f68f82242ee26e30c1284c97c;hpb=b6603da5f648d772d749ae082001a87b093e5cf9;p=creaImageIO.git

diff --git a/src/creaImageIOGimmick.cpp b/src/creaImageIOGimmick.cpp
index 06e32ce..c473a33 100644
--- a/src/creaImageIOGimmick.cpp
+++ b/src/creaImageIOGimmick.cpp
@@ -62,14 +62,14 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/gimmick/");
+    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"share/creaImageIO/");
 
     mSettings  = new Settings(mCurrentDirectory);
 	
     std::string dbpath = GetLocalDatabasePath();
 
     // Create or open local database
-    std::string dpath= mCurrentDirectory + "/.gimmick/share/gimmick/" + mLocalDescpName;
+    std::string dpath= mCurrentDirectory + "/.creaImageIO/share/creaImageIO/" + mLocalDescpName;
 	
     boost::algorithm::replace_all( dpath,
 				   INVALID_FILE_SEPARATOR , 
@@ -186,7 +186,7 @@ namespace creaImageIO
     if (mUserSettingsDirectory.size()==0) 
       {
 	mUserSettingsDirectory = GetHomeDirectory();
-	mUserSettingsDirectory += "/.gimmick/";
+	mUserSettingsDirectory += "/.creaImageIO/";
 	boost::algorithm::replace_all( mUserSettingsDirectory, 
 				       INVALID_FILE_SEPARATOR , 
 				       VALID_FILE_SEPARATOR);
@@ -202,7 +202,7 @@ namespace creaImageIO
     if (mLocalDatabasePath.size()==0) 
       {
 	mLocalDatabasePath = GetUserSettingsDirectory();
-	mLocalDatabasePath += "share/gimmick/";
+	mLocalDatabasePath += "share/creaImageIO/";
 	mLocalDatabasePath += mLocalDBName;
 	mLocalDatabasePath +=".sqlite3";
 	boost::algorithm::replace_all( mLocalDatabasePath,
@@ -259,7 +259,7 @@ namespace creaImageIO
 				       VALID_FILE_SEPARATOR);
 	setDir+="share/";
 	boost::filesystem::create_directory( setDir );
-	setDir+="gimmick/";
+	setDir+="creaImageIO/";
 	boost::filesystem::create_directory( setDir );
 	setDir+=mLocalDescpName;
 
@@ -277,14 +277,14 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
 		
 #if defined(_WIN32)		
-		path+="/bin/share/gimmick/";
+		path+="/bin/share/creaImageIO/";
 #endif
 
 #if defined (LINUX)
-		path+="/../share/gimmick/";
+		path+="/../share/creaImageIO/";
 #endif	
 #if defined(__APPLE__)
-		path+="/../../../../share/gimmick/";
+		path+="/../../../../share/creaImageIO/";
 #endif 
 
 
@@ -539,7 +539,7 @@ void Gimmick::fillVectInfos(std::vector<std::string> i_attr, OutputAttr &infos)
 	}
 }
 
-const std::stringstream Gimmick::getSummary()
+const std::string Gimmick::getSummary()
 {
       const AddProgress& p = GetAddProgress();
     std::stringstream mess;
@@ -547,7 +547,7 @@ const std::stringstream Gimmick::getSummary()
     mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
     mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
     mess << "Files\tadded  \t: " << p.GetNumberAddedFiles()   << "\n\n";
-    return mess;
+    return mess.str();
 }
 
 }
\ No newline at end of file