X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=a13809b7a8a1c885ff35590e88c6074976b4f386;hb=e4a54c9026a2a0c17e3be0b5915c34688a9385ad;hp=0e3e4bec68ecb1845709e2bce1d2a83f36350718;hpb=e1585a963c032a4db1aac504991ef4f1f5789e7f;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 0e3e4be..a13809b 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -10,8 +10,6 @@
 
 namespace creaImageIO
 {
-
-
   //==============================================================
   Gimmick::Gimmick()
     : mImageAdder(0)
@@ -23,18 +21,17 @@ namespace creaImageIO
   //==============================================================
 
 
-
   //==============================================================
   Gimmick::~Gimmick()
   {
 	 if(mSettings!=0)
 	  {
-	  mSettings->writeSettingsFile();
-      delete mSettings;
+	  	mSettings->writeSettingsFile();
+		delete mSettings;
 	  }
-	  if(mSynchronizer!=0)
+	if(mSynchronizer!=0)
 	  {
-	  delete mSynchronizer;
+	  	delete mSynchronizer;
 	  }
   }
   //==============================================================
@@ -57,7 +54,6 @@ namespace creaImageIO
 
     mSettings  = new Settings(mCurrentDirectory);
 	
-
     std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
     std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.dscp";
@@ -69,9 +65,7 @@ namespace creaImageIO
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
     
     //Add additional DB from user Settings
-    addDBSettings();
-
-	
+    addDBSettings();	
   }
 
    ///////////////////////////////////////////////////////////////////////
@@ -80,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())
 		{
@@ -98,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
@@ -114,7 +108,7 @@ namespace creaImageIO
 		 // CREATING DB STRUCTURE
          sqlTreeH->GetTree().GetDescriptor().createDescriptorfromFile(i_locDesc);
          if ( ! sqlTreeH->Create(true) )
-	{
+	 {
 		GimmickError("ERROR CREATING '"<<i_locDB<<"'");
          }
          sqlTreeH->SetAttribute(0,"Name",i_name);
@@ -131,14 +125,14 @@ namespace creaImageIO
 	return sqlTreeH;
   }
 
-
   //==============================================================
   void Gimmick::Finalize()
   {
 	 
 	  // delete SQLiteTreeHandler Object
 	   for( TreeHandlerMapType::const_iterator it = mTreeHandlerMap.begin();
-           it!= mTreeHandlerMap.end(); ++it)
+                                                   it!= mTreeHandlerMap.end(); 
+						   ++it)
 	   {
 		   delete it->second;
 	   }
@@ -199,7 +193,6 @@ namespace creaImageIO
     return mLocalDatabasePath;    
   }
 
-
   //========================================================================
 
   //========================================================================
@@ -237,9 +230,14 @@ namespace creaImageIO
 		path=path.substr(0,path.size()-1);
 		path=path.substr(0,path.find_last_of("/"));
 		//Creating directories
+
+// The following stuff works on Linux, NOT CHECKED on Windows // JPR
 		
-		//path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";  // JPR
+#if defined(_WIN32)		
+		path+="/bin/Shared/gimmick/localdatabase_Descriptor.dscp";
+#else		
 		path+="/Shared/gimmick/localdatabase_Descriptor.dscp";
+#endif		
 		std::cout <<"From: " << path   <<std::endl;
 		std::cout <<"To: "   << setDir <<std::endl;
 		boost::algorithm::replace_all(	path,
@@ -280,8 +278,6 @@ namespace creaImageIO
     return i->second;
   }
 
-
-
   //========================================================================
   /// Add the files to the tree handler
   void Gimmick::AddFiles(const std::string& d, 
@@ -290,10 +286,9 @@ namespace creaImageIO
     GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
 	mImageAdder.SetCurrentDatabase(d);
-    mImageAdder.SetTreeHandler(GetTreeHandler(d));
+	mImageAdder.SetTreeHandler(GetTreeHandler(d));
 	mImageAdder.SetSynchronizer(mSynchronizer);
-	mImageAdder.AddFiles(filenames);
-	
+	mImageAdder.AddFiles(filenames);	
   }
   //========================================================================
 
@@ -302,14 +297,14 @@ namespace creaImageIO
   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.SetTreeHandler(handler);
 	mImageAdder.SetSynchronizer(mSynchronizer);
-    mImageAdder.AddDirectory(f,recurse);  
+	mImageAdder.AddDirectory(f,recurse);  
   }
 
   //========================================================================
@@ -356,16 +351,16 @@ 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<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);
@@ -386,32 +381,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()
   {
 
@@ -438,7 +433,5 @@ namespace creaImageIO
 		 std::string name = it_path->substr(pos +1, last_pos -pos-1 );
 		 addDB(name, it_path->c_str());
 	 }
-
-  }
-	
+  }	
 }