X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=a13809b7a8a1c885ff35590e88c6074976b4f386;hb=2b77f7c38cce3fc778468a694d154ac1db6037b3;hp=09a6fd00685fdd34328f9ef18ae91fd960039354;hpb=75778b43c0c928b88c6dc93f2c8b2c1ac6af59e5;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 09a6fd0..a13809b 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -26,12 +26,12 @@ namespace creaImageIO { if(mSettings!=0) { - mSettings->writeSettingsFile(); - delete mSettings; + mSettings->writeSettingsFile(); + delete mSettings; } - if(mSynchronizer!=0) + if(mSynchronizer!=0) { - delete mSynchronizer; + delete mSynchronizer; } } //============================================================== @@ -74,8 +74,8 @@ namespace creaImageIO // @param i_location : DB location // // return : - // //////////////////////////////////////////////////////////////////////// - void Gimmick::addDB(const std::string &i_name, - const std::string &i_location) + void Gimmick::addDB(const std::string &i_name, + const std::string &i_location) { if(mTreeHandlerMap.find(i_name) == mTreeHandlerMap.end()) { @@ -92,9 +92,9 @@ namespace creaImageIO // @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) + SQLiteTreeHandler *Gimmick::createDB(const std::string &i_name, + const std::string &i_locDesc, + const std::string &i_locDB) { SQLiteTreeHandler *sqlTreeH = new SQLiteTreeHandler(i_locDB); // Create or open local database @@ -108,7 +108,7 @@ namespace creaImageIO // CREATING DB STRUCTURE sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc); if ( ! sqlTreeH->Create(true) ) - { + { GimmickError("ERROR CREATING '"<SetAttribute(0,"Name",i_name); @@ -131,7 +131,8 @@ namespace creaImageIO // delete SQLiteTreeHandler Object for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); - it!= mTreeHandlerMap.end(); ++it) + it!= mTreeHandlerMap.end(); + ++it) { delete it->second; } @@ -285,10 +286,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); @@ -381,23 +381,24 @@ 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); } //========================================================================