correctios to use gdcm2

[creaImageIO.git] / src2 / creaImageIOGimmick.cpp

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index e168c3769baa12b10a85243a77011076f39a6e81..b72b477446621dfd71e56bb50635cd3820a8c702 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -8,11 +8,12 @@
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
-
+#include <creaImageIOGimmick.h>
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
 
+
 namespace creaImageIO
 {
   //==============================================================
@@ -22,6 +23,8 @@ namespace creaImageIO
   RegisterGimmickMessageTypes();
        mSettings=0;
        mSynchronizer=0;
+       mLocalDescpName = "localdatabase_Descriptor.dscp";
+       mLocalDBName = "Local database";
   }
   //==============================================================
 
@@ -29,6 +32,7 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
+
         if(mSettings!=0)
          {
                mSettings->writeSettingsFile();
@@ -42,15 +46,17 @@ namespace creaImageIO
   //==============================================================
   
   //==============================================================
-  void Gimmick::Initialize(const std::string& path)
+  void Gimmick::Initialize(const std::string i_namedescp, const std::string i_namedb)
   {
+         mLocalDescpName = i_namedescp;
+         mLocalDBName = i_namedb;
          Initialize();
   }
 
   //==============================================================
   void Gimmick::Initialize()
   {
-       std::string i_nameDB = "Local database";
+       std::string i_nameDB = mLocalDBName;
     // Create the UserSettings dir if does not exist
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
@@ -60,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/localdatabase_Descriptor.dscp";
+    std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName;
+       
     boost::algorithm::replace_all( dpath,
                                   INVALID_FILE_SEPARATOR , 
                                   VALID_FILE_SEPARATOR);
@@ -121,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<<"'");
@@ -133,14 +142,16 @@ namespace creaImageIO
   //==============================================================
   void Gimmick::Finalize()
   {
-        
-         // delete SQLiteTreeHandler Object
-          for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
-                                                   it!= mTreeHandlerMap.end(); 
-                                                  ++it)
-          {
-                  delete it->second;
-          }
+         if(mTreeHandlerMap.size() >0)
+         {
+               // delete SQLiteTreeHandler Object
+               for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
+                                                                                                       it!= mTreeHandlerMap.end(); 
+                                                       ++it)
+               {
+                       delete it->second;
+               }
+         }
   }
   //==============================================================
 
@@ -190,7 +201,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);
@@ -203,10 +216,35 @@ namespace creaImageIO
   //========================================================================
   void Gimmick::CreateUserSettingsDirectory()
   {
-    if (! boost::filesystem::is_directory( GetUserSettingsDirectory() ) )
+         
+        // 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();
+               //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() ) )
          {
@@ -222,12 +260,11 @@ namespace creaImageIO
        boost::filesystem::create_directory( setDir );
        setDir+="gimmick/";
        boost::filesystem::create_directory( setDir );
-       setDir+="localdatabase_Descriptor.dscp";
+       setDir+=mLocalDescpName;
 
        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;
                
@@ -239,10 +276,19 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
                
 #if defined(_WIN32)            
-               path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";
-#else          
-               path+="/Shared/gimmick/localdatabase_Descriptor.dscp";
-#endif         
+               path+="/bin/Shared/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,
@@ -250,6 +296,7 @@ namespace creaImageIO
                                                VALID_FILE_SEPARATOR);
                boost::filesystem::copy_file(path,setDir);
        }
+         
   }
   //========================================================================