X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=04e8c689f0c40c5397be670448cdb5113a29ea20;hb=b0843014c5482f70050fab8036c6780172e3b6c9;hp=f5d21100df39391a3be34cd7251915189e6cc4d2;hpb=e13ea6551e8721b11998dc33ddccf3f89458f173;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index f5d2110..04e8c68 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -1,3 +1,4 @@ + #include #include @@ -8,80 +9,80 @@ # define PATH_MAX 2048 #endif -namespace creaImageIO -{ +namespace creaImageIO +{ //============================================================== Gimmick::Gimmick() : mImageAdder(0) { - RegisterGimmickMessageTypes(); + RegisterGimmickMessageTypes(); mSettings=0; mSynchronizer=0; + mLocalDescpName = "localdatabase_Descriptor.dscp"; + mLocalDBName = "Local database"; } //============================================================== - //============================================================== Gimmick::~Gimmick() { if(mSettings!=0) { - mSettings->writeSettingsFile(); - delete mSettings; + mSettings->writeSettingsFile(); + delete mSettings; } - if(mSynchronizer!=0) + if(mSynchronizer!=0) { - delete mSynchronizer; + delete mSynchronizer; } } //============================================================== //============================================================== - 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 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.txt"; - boost::algorithm::replace_all( dpath, - INVALID_FILE_SEPARATOR , - VALID_FILE_SEPARATOR); - mLocalDatabase = createDB(i_nameDB, dpath, dbpath); + std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/" + mLocalDescpName; + 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 : - // - /////////////////////////////////////////////////////////////////////// - void Gimmick::addDB(const std::string &i_name, - const std::string &i_location) + // 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) { if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end()) { @@ -91,7 +92,6 @@ namespace creaImageIO } } - /////////////////////////////////////////////////////////////////////////// // create a DB from a attributes descriptor file for medical images // // @param i_name : DB name // @@ -99,11 +99,11 @@ namespace creaImageIO // @param i_locDB : location of DB // // return : the SQLiteTreeHandler object on DB // ///////////////////////////////////////////////////////////////////////// - SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name, + SQLiteTreeHandler* Gimmick::createDB(const std::string &i_name, const std::string &i_locDesc, const std::string &i_locDB) { - SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB); + SQLiteTreeHandler* sqlTreeH( new SQLiteTreeHandler(i_locDB) ); // Create or open local database if (! boost::filesystem::exists(i_locDB) ) { @@ -115,34 +115,37 @@ namespace creaImageIO // CREATING DB STRUCTURE sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc); if ( ! sqlTreeH->Create(true) ) - { - GimmickError("ERROR CREATING '"<SetAttribute(0,"Name",i_name); } else { /// Open and test it - GimmickMessage(1,"Opening local database '" <Open(true) ) + + GimmickDebugMessage(1,"Opening local database '" <Open(true) ) { GimmickError("ERROR OPENING '"<second; - } + if(mTreeHandlerMap.size() >0) + { + // delete SQLiteTreeHandler Object + for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); + it!= mTreeHandlerMap.end(); + ++it) + { + delete it->second; + } + } } //============================================================== @@ -192,7 +195,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); @@ -200,16 +205,39 @@ namespace creaImageIO return mLocalDatabasePath; } - //======================================================================== //======================================================================== 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 '"<second; } - - //======================================================================== /// Add the files to the tree handler void Gimmick::AddFiles(const std::string& d, @@ -289,10 +324,9 @@ namespace creaImageIO GimmickMessage(2,"Adding files to '"<getValue(name); + value = mSettings->getValue(name); } //======================================================================== //======================================================================== void Gimmick::GetAttributes(const std::string& d, - const std::string& filename, - const std::vector& params, - std::vector& results) + const std::string& filename, + const std::vector& params, + std::vector& results) { TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); @@ -385,32 +419,32 @@ namespace creaImageIO void Gimmick::DeleteDrive(const std::string& drive) { - for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); - it!= mTreeHandlerMap.end(); ++it) + for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); + it!= mTreeHandlerMap.end(); + ++it) { mImageAdder.SetTreeHandler(it->second); mImageAdder.DeleteDriveFromMainDB(drive); } - mImageAdder.SetSynchronizer(mSynchronizer); - mImageAdder.DeleteDriveFromOtherDB(drive); + mImageAdder.SetSynchronizer(mSynchronizer); + mImageAdder.DeleteDriveFromOtherDB(drive); } //======================================================================== void Gimmick::EditField(tree::Node* node, const std::string& d, const std::string& name, const std::string& key, const std::string& val) { - TreeHandler * handler=GetTreeHandler(d); - mImageAdder.SetCurrentDatabase(d); - mImageAdder.SetTreeHandler(handler); - mImageAdder.EditField(node,name,key,val); + TreeHandler * handler=GetTreeHandler(d); + mImageAdder.SetCurrentDatabase(d); + mImageAdder.SetTreeHandler(handler); + mImageAdder.EditField(node,name,key,val); } //======================================================================== - - ///////////////////////////////////////////////////////////////////////// - // add DB from Settings file // - // @param : - // - // return : - // - ///////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////// + // add DB from Settings file // + // @param : - // + // return : - // + //////////////////////////////////////////////////////////////////////// void Gimmick::addDBSettings() { @@ -437,7 +471,5 @@ namespace creaImageIO std::string name = it_path->substr(pos +1, last_pos -pos-1 ); addDB(name, it_path->c_str()); } - - } - + } }