+
#include <creaImageIOGimmick.h>
#include <creaImageIOSystem.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include "io.h"
+//#include "io.h"
#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
{
-
-
//==============================================================
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)
{
- mDescriptorPath=path;
+ 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();
-
- // 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<<std::endl);
-
- if ( ! mTimestampDatabase->Create() )
- {
- GimmickError("ERROR CREATING '"<<GetTimestampDatabasePath()<<"'");
- }
-
- }
- else
- {
- /// Open and test it
- GimmickMessage(1,"Opening Timestamp database '"
- <<GetTimestampDatabasePath()<<"' "
- <<std::endl);
- if ( ! mTimestampDatabase->Open() )
- {
- GimmickError("ERROR OPENING '"<<GetTimestampDatabasePath()<<"'");
- }
-
- }
-
+ //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())
{
}
}
-
///////////////////////////////////////////////////////////////////////////
// create a DB from a attributes descriptor file for medical images //
// @param i_name : DB name //
// @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) )
{
// 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);
}
else
{
/// Open and test it
- GimmickMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
- if ( !sqlTreeH->Open(true) )
+
+ GimmickDebugMessage(1,"Opening local database '" <<i_locDB<< "' " << std::endl);
+ if ( !sqlTreeH->Open(true) )
{
GimmickError("ERROR OPENING '"<<i_locDB<<"'");
}
- }
- return sqlTreeH;
+ }
+ return sqlTreeH;
}
-
//==============================================================
void Gimmick::Finalize()
{
-
- // delete SQLiteTreeHandler Object
- for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
- it!= mTreeHandlerMap.end(); ++it)
- {
- delete it->second;
- }
- delete mTimestampDatabase;
+ if(mTreeHandlerMap.size() >0)
+ {
+ // delete SQLiteTreeHandler Object
+ for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
+ it!= mTreeHandlerMap.end();
+ ++it)
+ {
+ delete it->second;
+ }
+ }
}
//==============================================================
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);
return mLocalDatabasePath;
}
- //================================================================
-
- //================================================================
- const std::string& Gimmick::GetTimestampDatabasePath()
- {
- if (mTimestampDatabasePath.size()==0)
- {
- mTimestampDatabasePath = GetUserSettingsDirectory();
- mTimestampDatabasePath += "Shared/gimmick/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 '"<<GetUserSettingsDirectory()<<"' "
- << "does not exist : creating it"<<std::endl);
+ << "does not exist : creating it"<<std::endl);
if ( ! boost::filesystem::create_directory( GetUserSettingsDirectory() ) )
{
boost::filesystem::create_directory( setDir );
setDir+="gimmick/";
boost::filesystem::create_directory( setDir );
- setDir+="localdatabase_Descriptor.txt";
+ setDir+=mLocalDescpName;
if(!boost::filesystem::is_regular(setDir))
{
path=path.substr(0,path.size()-1);
path=path.substr(0,path.find_last_of("/"));
//Creating directories
- path+="/bin/Shared/gimmick/localdatabase_Descriptor.txt";
- std::cout<<"From: "<<path<<std::endl;
- std::cout<<"To: "<<setDir<<std::endl;
- boost::algorithm::replace_all( path,
+
+// The following stuff works on Linux, NOT CHECKED on Windows // JPR
+
+#if defined(_WIN32)
+ path+="/bin/shared/gimmick/";
+#endif
+
+#if defined(__APPLE__)
+ path+="../../../../shared/gimmick/";
+#endif
+
+#if defined (LINUX)
+ path+="../shared/gimmick/";
+#endif
+ path+= mLocalDescpName;
+ 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);
return i->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,
GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
mImageAdder.SetCurrentDatabase(d);
- mImageAdder.SetTreeHandler(GetTreeHandler(d));
- mImageAdder.SetTimestampHandler(mTimestampDatabase);
+ mImageAdder.SetTreeHandler(GetTreeHandler(d));
mImageAdder.SetSynchronizer(mSynchronizer);
- mImageAdder.AddFiles(filenames);
-
+ mImageAdder.AddFiles(filenames);
}
//========================================================================
void Gimmick::AddDir(const std::string& d, const std::string& f,
bool recurse)
{
- GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
- <<recurse<<std::endl);
+ GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
+ <<recurse<<std::endl);
TreeHandler * handler=GetTreeHandler(d);
mImageAdder.SetCurrentDatabase(d);
- mImageAdder.SetTreeHandler(handler);
- mImageAdder.SetTimestampHandler(mTimestampDatabase);
+ mImageAdder.SetTreeHandler(handler);
mImageAdder.SetSynchronizer(mSynchronizer);
- mImageAdder.AddDirectory(f,recurse);
+ mImageAdder.AddDirectory(f,recurse);
}
//========================================================================
{
mImageAdder.SetCurrentDatabase(d);
mImageAdder.SetSynchronizer(mSynchronizer);
- mTimestampDatabase->RemoveNode("PATH",node,d);
mImageAdder.RemoveFile(node);
}
//========================================================================
TreeHandler * handler=GetTreeHandler(d);
mImageAdder.SetCurrentDatabase(d);
mImageAdder.SetTreeHandler(handler);
- mImageAdder.SetTimestampHandler(mTimestampDatabase);
mImageAdder.SetSynchronizer(mSynchronizer);
mImageAdder.CopyFiles(filenames, mSettings->getValue(SETTINGS_COPY_PATH));
}
TreeHandler * handler=GetTreeHandler(d);
mImageAdder.SetCurrentDatabase(d);
mImageAdder.SetTreeHandler(handler);
- mImageAdder.SetTimestampHandler(mTimestampDatabase);
mImageAdder.SetSynchronizer(mSynchronizer);
return mImageAdder.Synchronize(repair, checkAttributes);
}
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<std::string>& params,
- std::vector<std::string>& results)
+ const std::string& filename,
+ const std::vector<std::string>& params,
+ std::vector<std::string>& results)
{
TreeHandler * handler=GetTreeHandler(d);
mImageAdder.SetCurrentDatabase(d);
mImageAdder.SetTreeHandler(handler);
- mImageAdder.SetTimestampHandler(mTimestampDatabase);
mImageAdder.SetSynchronizer(mSynchronizer);
mImageAdder.GetAttributes(params, filename, results);
}
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()
{
std::string name = it_path->substr(pos +1, last_pos -pos-1 );
addDB(name, it_path->c_str());
}
-
- }
-
+ }
}
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff