no message

[creaImageIO.git] / src2 / creaImageIOGimmick.cpp

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 633f0c88029c08f4e207040413ed306938744b41..44047ae757051e9bc114d33ae2f8a44f4159c5e5 100644 (file)
--- 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();
@@ -69,8 +66,10 @@ namespace creaImageIO
     mSettings  = new Settings(mCurrentDirectory);
        
     std::string dbpath = GetLocalDatabasePath();
+
     // Create or open local database
     std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName;
+       
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
                                   VALID_FILE_SEPARATOR);
@@ -130,7 +129,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<<"'");
@@ -216,6 +216,7 @@ namespace creaImageIO
   //========================================================================
   void Gimmick::CreateUserSettingsDirectory()
   {
+         
         // std::string st("C:/Documents and Settings/cervenansky/.gimmick/");
         //     boost::algorithm::replace_all( st, 
                //                     INVALID_FILE_SEPARATOR , 
@@ -264,7 +265,6 @@ namespace creaImageIO
        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;
                
@@ -276,12 +276,19 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
                
 #if defined(_WIN32)            
-               path+="/bin/Shared/gimmick/";
-               path+=mLocalDescpName;
-#else          
-               path+="/Shared/gimmick/";
-               path+= mLocalDescpName;
-#endif         
+               path+="/bin/share/gimmick/";
+#endif
+
+#if defined (LINUX)
+               path+="/../share/gimmick/";
+#endif 
+#if defined(__APPLE__)
+               path+="/../../../../share/gimmick/";
+#endif 
+
+
+path+= mLocalDescpName;
+               
                std::cout <<"From: " << path   <<std::endl;
                std::cout <<"To: "   << setDir <<std::endl;
                boost::algorithm::replace_all(  path,
@@ -289,6 +296,7 @@ namespace creaImageIO
                                                VALID_FILE_SEPARATOR);
                boost::filesystem::copy_file(path,setDir);
        }
+         
   }
   //========================================================================