X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmick.cpp;h=615f1f041f90b50a41886121d516a11c8df72dea;hb=da2cb2feea7bdf425151ea3fd71abf9b8b72c366;hp=0dc9796582297d38a4a24b8832d149c3a6951089;hpb=46fb4b43011a4043c7b5ef2e7bd57e1695cd6b7f;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 0dc9796..615f1f0 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -1,106 +1,92 @@ + #include #include #include #include - +//#include "io.h" #ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 #endif +#include +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + 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 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()); + 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 - mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", 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(); - - // Creates files and directories database - mTimestampDatabase = new TimestampDatabaseHandler(GetTimestampDatabasePath()); - // Create or open local database - if (! boost::filesystem::exists( GetTimestampDatabasePath() ) ) - { - std::string mess = "Timestamp database '"; - mess += GetTimestampDatabasePath(); - mess += "' does not exist : creating it"; - GimmickMessage(1,mess<Create() ) - { - GimmickError("ERROR CREATING '"<Open() ) - { - GimmickError("ERROR OPENING '"<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; - } - delete mTimestampDatabase; + if(mTreeHandlerMap.size() >0) + { + // delete SQLiteTreeHandler Object + for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin(); + it!= mTreeHandlerMap.end(); + ++it) + { + delete it->second; + } + } } //============================================================== @@ -205,129 +192,6 @@ namespace creaImageIO } //================================================================ - //================================================================ - int Gimmick::GetBinaryDirectory(char *pname, size_t pathsize) - { - - #ifdef LINUX - /* Oddly, the readlink(2) man page says no NULL is appended. */ - /* So you have to do it yourself, based on the return value: */ - pathsize --; /* Preserve a space to add the trailing NULL */ - long result = readlink("/proc/self/exe", pname, pathsize); - if (result > 0) - { - pname[result] = 0; /* add the #@!%ing NULL */ - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } - #endif /* LINUX */ - - #ifdef WIN32 - long result = GetModuleFileName(NULL, pname, pathsize); - if (result > 0) - { - /* fix up the dir slashes... */ - int len = strlen(pname); - int idx; - for (idx = 0; idx < len; idx++) - { - if (pname[idx] == '\\') pname[idx] = '/'; - } - - for (idx = len-1; idx >=0 ; idx--) - { - if (pname[idx] == '/') - { - pname[idx+1] = '\0'; - idx = -1; - } - } - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } - #endif /* WIN32 */ - - #ifdef SOLARIS - char *p = getexecname(); - if (p) - { - /* According to the Sun manpages, getexecname will - "normally" return an */ - /* absolute path - BUT might not... AND that IF it is not, - pre-pending */ - /* getcwd() will "usually" be the correct thing... Urgh! - */ - - /* check pathname is absolute (begins with a / ???) */ - if (p[0] == '/') /* assume this means we have an - absolute path */ - { - strncpy(pname, p, pathsize); - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - } - else /* if not, prepend getcwd() then check if file - exists */ - { - getcwd(pname, pathsize); - long result = strlen(pname); - strncat(pname, "/", (pathsize - result)); - result ++; - strncat(pname, p, (pathsize - result)); - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL - (falls through) */ - } - } - #endif /* SOLARIS */ - - #ifdef MACOSX /* assume this is OSX */ - /* - from http://www.hmug.org/man/3/NSModule.html - - extern int _NSGetExecutablePath(char *buf, unsigned long - *bufsize); - - _NSGetExecutablePath copies the path of the executable - into the buffer and returns 0 if the path was successfully - copied in the provided buffer. If the buffer is not large - enough, -1 is returned and the expected buffer size is - copied in *bufsize. Note that _NSGetExecutablePath will - return "a path" to the executable not a "real path" to the - executable. That is the path may be a symbolic link and - not the real file. And with deep directories the total - bufsize needed could be more than MAXPATHLEN. - */ - - int status = -1; - char *given_path = (char*)malloc(MAXPATHLEN * 2); - if (!given_path) return status; - - uint32_t npathsize = MAXPATHLEN * 2; - long result = _NSGetExecutablePath(given_path, &npathsize); - if (result == 0) - { /* OK, we got something - now try and resolve the real path... - */ - if (realpath(given_path, pname) != NULL) - { - if ((access(pname, 0) == 0)) - status = 0; /* file exists, return OK */ - } - } - free (given_path); - return status; - #endif /* MACOSX */ - - return -1; /* Path Lookup Failed */ - } //================================================================ const std::string& Gimmick::GetLocalDatabasePath() @@ -335,7 +199,9 @@ namespace creaImageIO if (mLocalDatabasePath.size()==0) { mLocalDatabasePath = GetUserSettingsDirectory(); - mLocalDatabasePath += "local_database.sqlite3"; + mLocalDatabasePath += "Shared/gimmick/"; + mLocalDatabasePath += mLocalDBName; + mLocalDatabasePath +=".sqlite3"; boost::algorithm::replace_all( mLocalDatabasePath, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); @@ -343,30 +209,39 @@ namespace creaImageIO return mLocalDatabasePath; } - //================================================================ - - //================================================================ - const std::string& Gimmick::GetTimestampDatabasePath() - { - if (mTimestampDatabasePath.size()==0) - { - mTimestampDatabasePath = GetUserSettingsDirectory(); - mTimestampDatabasePath += "timestamp_database.sqlite3"; - boost::algorithm::replace_all( mTimestampDatabasePath, - INVALID_FILE_SEPARATOR , - VALID_FILE_SEPARATOR); - } - return mTimestampDatabasePath; - } //======================================================================== //======================================================================== 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; } - //======================================================================== - ///Returns the timestamp database handler - TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const - { - return mTimestampDatabase; - } - - //======================================================================== /// Add the files to the tree handler void Gimmick::AddFiles(const std::string& d, @@ -442,11 +328,9 @@ namespace creaImageIO GimmickMessage(2,"Adding files to '"<RemoveNode("PATH",node,d); mImageAdder.RemoveFile(node); } //======================================================================== @@ -486,7 +368,6 @@ namespace creaImageIO TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); mImageAdder.CopyFiles(filenames, mSettings->getValue(SETTINGS_COPY_PATH)); } @@ -498,7 +379,6 @@ namespace creaImageIO TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); return mImageAdder.Synchronize(repair, checkAttributes); } @@ -513,21 +393,20 @@ namespace creaImageIO void Gimmick::GetSetting(const std::string& name, std::string& value) { - value = mSettings->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); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); mImageAdder.GetAttributes(params, filename, results); } @@ -544,33 +423,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.SetTimestampHandler(mTimestampDatabase); - 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() { @@ -597,7 +475,5 @@ namespace creaImageIO std::string name = it_path->substr(pos +1, last_pos -pos-1 ); addDB(name, it_path->c_str()); } - - } - + } }