X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOSynchron.cpp;h=8ae670f60fde80856638a28e3f2d797dd747de74;hb=52f3d800d1bfa583dbdf0115860cc183ca9319cd;hp=0955ffaee260161d386f73b4391d220c5e3c314d;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git

diff --git a/src/creaImageIOSynchron.cpp b/src/creaImageIOSynchron.cpp
index 0955ffa..8ae670f 100644
--- a/src/creaImageIOSynchron.cpp
+++ b/src/creaImageIOSynchron.cpp
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
 #include <creaImageIOSynchron.h>
 #include <creaImageIOSystem.h>
 #include <boost/filesystem.hpp>
@@ -111,12 +138,12 @@ namespace creaImageIO
 		do
 		{
 			pos = str.find('\\');
-			if (pos!=-1)  
+			if ( pos != (size_t)-1 )  
 			{
 				str.replace(pos, 1, "/");
 			}
 		}
-		while (pos!=-1);
+		while ( pos != (size_t)-1 );
 	}
 
 	//=====================================================================
@@ -213,7 +240,7 @@ namespace creaImageIO
 		std::string pat=path.c_str();
 		CleanName(pat);
 		insert="INSERT INTO ADD_OPS (PATH,RECURSIVE,FILES_ADDED,REFERENCEDDB) VALUES('";
-		insert+=pat+"','";
+		insert+=convert(pat)+"','";
 		insert+=recursive+"',";
 		insert+=nChildren+",'";
 		insert+=refdb+"');";
@@ -239,7 +266,7 @@ namespace creaImageIO
 			std::string insert;
 			insert="INSERT INTO IGNORED_FILES (ADD_KEY,PATH,REMOVE,TIME) VALUES('";
 			insert+=addKey+"','";
-			insert+=pat+"','";
+			insert+=convert(pat)+"','";
 			insert+=remove+"',";
 			insert+=time+");";
 			UPDATESYNCDB(insert);
@@ -256,7 +283,7 @@ namespace creaImageIO
 				std::string insert;
 				insert="INSERT INTO IGNORED_FILES (ADD_KEY,PATH,REMOVE,TIME) VALUES('";
 				insert+=addKey+"','";
-				insert+=pat+"','";
+				insert+=convert(pat)+"','";
 				insert+=remove+"',";
 				insert+=time+");";
 				UPDATESYNCDB(insert);
@@ -320,7 +347,7 @@ namespace creaImageIO
     {
         std::stringstream query;
 	std::string result;
-	std::string sVal=searchValue.c_str();
+	std::string sVal=convert(searchValue.c_str());
 	CleanName(sVal);
 	query<<"SELECT "<<attribute<<" FROM "<<table<<" WHERE "<<searchParam<<" = '"<<sVal;
 	if(table.compare("ADD_OPS")==0)
@@ -358,7 +385,7 @@ namespace creaImageIO
 				const std::string& refdb)
     {
 	std::string val=value.c_str();
-	std::string sVal=searchValue.c_str();
+	std::string sVal=convert(searchValue.c_str());
 	CleanName(val);
 	CleanName(sVal);
 	std::string sql = "UPDATE ";
@@ -409,7 +436,7 @@ namespace creaImageIO
 		query = "SELECT PATH, REMOVE FROM IGNORED_FILES WHERE";
 		if(keys.size() > 0)
 		{
-			for (int i=0; i < keys.size(); i++)
+			for (int i=0; i < (int)keys.size(); i++)
 			{
 				query += " ADD_KEY = " + keys[i];
 				query += " AND";
@@ -446,6 +473,13 @@ namespace creaImageIO
 		}
 		return valid;
 	}
+	  const std::string Synchronizer::convert(const std::string &i_word)
+	  {
+		  std::string temp = i_word;
+		  boost::algorithm::replace_all(temp,"'","''");
+
+	  return temp.c_str();
+  }
 }