X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOSQLiteTreeHandler.cpp;h=e51bfa91ad9760cb0e3e8ce1246088f1bf8ffc21;hb=0d75ab3cb25deacda0547d4156ebef481396c62e;hp=562aa6d2a4c3b3ebf048e9cf2651246903bc1b85;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOSQLiteTreeHandler.cpp b/src/creaImageIOSQLiteTreeHandler.cpp
index 562aa6d..e51bfa9 100644
--- a/src/creaImageIOSQLiteTreeHandler.cpp
+++ b/src/creaImageIOSQLiteTreeHandler.cpp
@@ -570,7 +570,7 @@ namespace creaImageIO
 		// quote must be doubled
 		boost::algorithm::replace_all(i_str,"'","''");
 		// Found strange strings which contained NULL char INSIDE string 
-		int i,size=i_str.size();
+		int i,size=(int)i_str.size();
 		for (i=0;i<size;++i) 
 		{
 			if (i_str[i]==0) 
@@ -980,7 +980,7 @@ GimmickDebugMessage(1,					"query : '"			    <<query			    		    <<std::endl);
   void SQLiteTreeHandler::getAllAttributes(std::string i_filename, std::map<std::string, std::string> &i_results)
   {
 	  int level=GetTree().GetNumberOfLevels()-1;
-	  
+
 	  std::string search = i_filename;
 	  std::string param = "FullFileName";
 	  std::string name;
@@ -992,25 +992,27 @@ GimmickDebugMessage(1,					"query : '"			    <<query			    		    <<std::endl);
 	  std::vector<std::string> values;
 	  std::vector<std::string>::iterator it_val;
 	 
-
-
-	  
-	  while(level>1)
+	  while(level>=1)
 	  {
-		  attr = GetTree().GetAttributeDescriptorList(level,1);
+		attr = GetTree().GetAttributeDescriptorList(level,1);
 
-		  name = GetTree().GetLevelDescriptor(level).GetName();
-		  std::vector<std::string> values;
-		  GetUpLevelNodeId(level, param,search,id);
-		  GetAttributes(name, param,search,attr, values);
-		  for(it_attr = attr.begin(), it_val = values.begin(); it_attr != attr.end(); it_attr++, it_val++)
-		  {
-					i_results[(*it_attr).GetKey()] = (*it_val).c_str();
-		  }
-		  search = id;
-		  param = "ID";
-		  level --;
-	  }
+		name = GetTree().GetLevelDescriptor(level).GetName();
+		std::vector<std::string> values;
+
+//EED 2018-04-13		  GetUpLevelNodeId(level, param,search,id);  
+		if (level>1)
+		{
+			GetUpLevelNodeId(level, param,search,id);
+		}
+		GetAttributes(name, param,search,attr, values);
+		for(it_attr = attr.begin(), it_val = values.begin(); it_attr != attr.end(); it_attr++, it_val++)
+		{
+			i_results[(*it_attr).GetKey()] = (*it_val).c_str();
+		} // for
+		search = id;
+		param = "ID";
+		level --;
+	  } // while level
   }
 
 
@@ -1064,7 +1066,6 @@ GimmickDebugMessage(1,					"query : '"			    <<query			    		    <<std::endl);
 		q.nextRow();
 	  }
 	  parent_id = results.str();
-
   }