Fix the mess around :

/usr/local/bin/Shared/gimmick/localdatabase_Descriptor.txt vs .dscp
/usr/local/bin/Shared vs /usr/local/bin/bin/Shared

(Right now, checked on Linux only)

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 59a73484cfc1cf72fabcc154dbe3c2b2e6d6dc32..7b237e7fd21b1e45f9d566c58be90c24cec42553 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -60,7 +60,7 @@ IF (WIN32)
   INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO2 ) 
 ENDIF (WIN32)
 
- INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.txt DESTINATION bin/Shared/gimmick )
+ INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION bin/Shared/gimmick )
  
 IF (BUILD_STANDALONE_INSTALLER)
 

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 738256c0f477a27e5b864d5083c80e01212e37b2..0e3e4bec68ecb1845709e2bce1d2a83f36350718 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -53,33 +53,33 @@ namespace creaImageIO
     CreateUserSettingsDirectory();
     // Sets the current directory to the home dir
     mCurrentDirectory =  GetHomeDirectory();
-       mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
+    mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/");
 
-       mSettings  = new Settings(mCurrentDirectory);
+    mSettings  = new Settings(mCurrentDirectory);
        
 
-       std::string dbpath = GetLocalDatabasePath();
+    std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
-       std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp";
-       boost::algorithm::replace_all( dpath,
-                                      INVALID_FILE_SEPARATOR , 
-                                      VALID_FILE_SEPARATOR);
-       mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
+    std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp";
+    boost::algorithm::replace_all( dpath,
+                                  INVALID_FILE_SEPARATOR , 
+                                  VALID_FILE_SEPARATOR);
+    mLocalDatabase = createDB(i_nameDB, dpath, dbpath);
     // Add it to the TreeHandlerMap
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
     
-       //Add additional DB from user Settings
-       addDBSettings();
+    //Add additional DB from user Settings
+    addDBSettings();
 
        
   }
 
    ///////////////////////////////////////////////////////////////////////
-   // add DB to TreeHandler Map                                                                                        //
-   // @param i_name : DB name                                                                              //
-   // @param i_location : DB location                                                              //
-   // return : -                                                                                                               //
-  ///////////////////////////////////////////////////////////////////////
+   // add DB to TreeHandler Map                                                //
+   // @param i_name : DB name                                          //
+   // @param i_location : DB location                                  //
+   // return : -                                                       //
+  ////////////////////////////////////////////////////////////////////////
        void Gimmick::addDB(const std::string &i_name, 
                            const std::string &i_location)
        {
@@ -91,13 +91,13 @@ namespace creaImageIO
                }
        }
 
-  ///////////////////////////////////////////////////////////////////////////
-  // create a DB from a attributes descriptor file for medical images      //
-  // @param i_name : DB name                                                                                      //
-  // @param i_locDesc : location of descriptor file                                               //
-  // @param i_locDB : location of DB                                                                      //
-  // return : the SQLiteTreeHandler object on DB                                                  //
-       /////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////
+  // create a DB from a attributes descriptor file for medical images   //
+  // @param i_name : DB name                                           //
+  // @param i_locDesc : location of descriptor file                    //
+  // @param i_locDB : location of DB                                   //
+  // return : the SQLiteTreeHandler object on DB                       //
+       //////////////////////////////////////////////////////////////////
        SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name,
                                             const std::string &i_locDesc,
                                             const std::string &i_locDB)
@@ -114,8 +114,8 @@ namespace creaImageIO
                 // CREATING DB STRUCTURE
          sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
          if ( ! sqlTreeH->Create(true) )
-                {
-                       GimmickError("ERROR CREATING '"<<i_locDB<<"'");
+       {
+               GimmickError("ERROR CREATING '"<<i_locDB<<"'");
          }
          sqlTreeH->SetAttribute(0,"Name",i_name);
         }
@@ -123,12 +123,12 @@ namespace creaImageIO
         {
                /// Open and test it
                GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
-        if ( !sqlTreeH->Open(true) )
+               if ( !sqlTreeH->Open(true) )
                {
                        GimmickError("ERROR OPENING '"<<i_locDB<<"'");
                }
-      }
-        return sqlTreeH;
+       }
+       return sqlTreeH;
   }
 
 
@@ -237,10 +237,12 @@ namespace creaImageIO
                path=path.substr(0,path.size()-1);
                path=path.substr(0,path.find_last_of("/"));
                //Creating directories
-               path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";
-               std::cout<<"From: "<<path<<std::endl;
-               std::cout<<"To: "<<setDir<<std::endl;
-               boost::algorithm::replace_all( path,
+               
+               //path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";  // JPR
+               path+="/Shared/gimmick/localdatabase_Descriptor.dscp";
+               std::cout <<"From: " << path   <<std::endl;
+               std::cout <<"To: "   << setDir <<std::endl;
+               boost::algorithm::replace_all(  path,
                                                INVALID_FILE_SEPARATOR , 
                                                VALID_FILE_SEPARATOR);
                boost::filesystem::copy_file(path,setDir);