X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOSQLiteTreeHandler.cpp;h=3d3fe70c1639ad2357a75f628ff63462020a2e9f;hb=2df647c186de559388c62bfebba8795b860ee8ae;hp=4d0d49eae165825a158b77f9788857c54d07a3a1;hpb=f4bdead5143dc3d816f1c2f2bd9786a21c843760;p=creaImageIO.git

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 4d0d49e..3d3fe70 100644
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -13,15 +13,9 @@
 
 #include <deque>
 
-#include "wx/wx.h"
-#include <wx/dir.h>
-#include <wx/filename.h>
-
-
 //#include <icons/close.xpm>
 
 #include <creaWx.h>
-#include <creaMessageManager.h>
 using namespace crea;
 
 #include <boost/filesystem.hpp>
@@ -37,6 +31,7 @@ namespace creaImageIO
     : mFileName(filename)
   {
     mDB = new CppSQLite3DB;
+	mIsAdding=false;
     GimmickMessage(1,"SQLite version : "
 		   <<std::string(mDB->SQLiteVersion())<< std::endl);
   }
@@ -50,22 +45,6 @@ namespace creaImageIO
   //=============================================================
   
 
-  //=============================================================
-  void SQLiteTreeHandler::BuildDefaultTreeDescription()
-  {
-    /*
-    for (int i = Node::Patient;
-	 i <= Node::Image; 
-	 ++i)
-      {
-	mNodeTypeDescription[i].BuildDefault(i);
-      }
-    */
-
-    // TODO : GetTree().GetDescription().LoadXML(FILE);
-  }
-  //=============================================================
-
   //=============================================================
   //  void SQLiteTreeHandler::Print() const 
   //  {
@@ -91,54 +70,6 @@ namespace creaImageIO
   */
   //=====================================================================
 
-  //=====================================================================
-  char* format_sql(const std::string& s)
-  { 
-    return sqlite3_mprintf("%q",s.c_str());
-  }
-  //=====================================================================
-
-  //  sqlite3_exec(db, zSQL, 0, 0, 0);
-  //  sqlite3_free(zSQL);
-  //	char* CHAIN = format_sql(QUER);		\
-//  sqlite3_free(CHAIN);				\
-
-  //=====================================================================
-#define QUERYDB(QUER,RES)						\
-    try									\
-      {									\
-	GimmickMessage(2,"SQL: '"<<QUER<<"'"<<std::endl);		\
-	RES = mDB->execQuery(QUER.c_str());				\
-      }									\
-    catch (CppSQLite3Exception& e)					\
-      {									\
-	std::cout << "SQLite query '"<<QUER<<"' : "			\
-		  << e.errorCode() << ":"				\
-		  << e.errorMessage()<<std::endl;			\
-	creaError("SQLite query '"<<QUER<<"' : "			\
-		  << e.errorCode() << ":"				\
-		  << e.errorMessage() );				\
-      }									\
-    
-  //=====================================================================
-  
-  //=====================================================================
-#define UPDATEDB(UP)							\
-  try									\
-    {									\
-      GimmickMessage(2,"SQL: '"<<UP<<"'"<<std::endl);			\
-      mDB->execDML(UP.c_str());						\
-    }									\
-  catch (CppSQLite3Exception& e)					\
-    {									\
-      std::cout << "SQLite update '"<<UP<<"' Error : "			\
-		<< e.errorCode() << ":"					\
-		<< e.errorMessage()<<std::endl;				\
-      creaError("SQLite update '"<<UP<<"' Error : "			\
-		<< e.errorCode() << ":"					\
-		<< e.errorMessage() );					\
-    }									
-  //=====================================================================
 
   //=====================================================================
   bool SQLiteTreeHandler::Open(bool writable)
@@ -161,7 +92,7 @@ namespace creaImageIO
   //=====================================================================
   bool SQLiteTreeHandler::Close()
   {
-    return false;
+    return true;
   }
   //=====================================================================
 
@@ -171,19 +102,14 @@ namespace creaImageIO
   {
     return false;
   }
-  //=====================================================================
-
-  //===================================================================== 
-  unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
-  { 
-    return 0; 
-  }
+  
   //===================================================================== 
 
   //===================================================================== 
   int SQLiteTreeHandler::LoadChildren(tree::Node* parent, int maxlevel)
   {
-    return 0;
+    if (parent==0) parent = GetTree().GetTree();
+    return DBLoadChildren(parent,maxlevel);
   }
   //===================================================================== 
 
@@ -196,21 +122,81 @@ namespace creaImageIO
   }
   //===================================================================== 
 
-
   //===================================================================== 
-  int SQLiteTreeHandler::AddBranch( const std::map<std::string,std::string>& attr )
+  int SQLiteTreeHandler::AddBranch( const AttributeMapType& attr )
   {
-    return -1;
+    tree::Node* parent = DBGetParent(attr);
+    DBGraftToParent(parent,attr);
+    return (parent->GetLevel()+1);
+	  
   }
   //===================================================================== 
  
 
   //===================================================================== 
-   bool SQLiteTreeHandler::Remove(tree::Node*)
+   bool SQLiteTreeHandler::Remove(tree::Node* node)
    {
-     return false;
+   DBRecursiveRemoveNode(node);
+ 
+    //    std::cout << "DELETE"<<std::endl;
+   bool remove=false;
+   tree::Node* parent=node->GetParent();
+    if (parent)
+      {
+	int nC = parent->RemoveChildrenFromList(node);
+	if(nC>0 && parent->GetLevel()>0)
+	{	
+		std::stringstream out;
+		out <<nC;
+		SetAttribute(parent,"NumberOfChildren",out.str());
+	}
+	else
+	{
+		remove=true;
+	}
+
+      }
+    delete node;
+	if(remove&&parent->GetLevel()>0)
+	{
+		Remove(parent);
+	}
+    //    std::cout << "DELETE OK"<<std::endl;
+    return true;
    }
+  
+  //===================================================================== 
+
+  //===================================================================== 
+  /// Sets an attribute of a Node
+  bool SQLiteTreeHandler::SetAttribute(tree::Node* n, 
+				       const std::string& key,
+				       const std::string& value)
+  {
+    if (n==0) n=GetTree().GetTree();
+    return DBSetAttribute(n,key,value);
+  }
   //===================================================================== 
+   //===================================================================== 
+  /// Sets an attribute
+  void SQLiteTreeHandler::SetAttribute(const std::string& levelDescriptor, 
+			      const std::string& key,
+			      const std::string& value,
+				  const std::string& searchParam, 
+				  const std::string& searchVal)
+  {
+	DBSetAttribute(levelDescriptor,key,value,searchParam, searchVal);
+  }
+  //===================================================================== 
+  /// Deletes a tuple
+  void SQLiteTreeHandler::DeleteTuple(std::string levelDescriptor, 
+								std::string key, std::string value)
+  {
+    DBDelete(levelDescriptor,key,value);
+  }
+  //===================================================================== 
+
+
 
 
 
@@ -218,10 +204,66 @@ namespace creaImageIO
 
 
 
+
+
+
+
+  //=====================================================================
+  // SQLite DB specific methods
+  //=====================================================================
+
+
+
+
+  //=====================================================================
+  char* format_sql(const std::string& s)
+  { 
+    return sqlite3_mprintf("%q",s.c_str());
+  }
+  //=====================================================================
+
+  //  sqlite3_exec(db, zSQL, 0, 0, 0);
+  //  sqlite3_free(zSQL);
+  //	char* CHAIN = format_sql(QUER);		\
+//  sqlite3_free(CHAIN);				\
+
+  //=====================================================================
+#define QUERYDB(QUER,RES)						\
+    try									\
+      {									\
+	GimmickMessage(2,"SQL query: '"<<QUER<<"'"<<std::endl);		\
+	RES = mDB->execQuery(QUER.c_str());				\
+      }									\
+    catch (CppSQLite3Exception& e)					\
+      {									\
+	GimmickError("SQLite query '"<<QUER<<"' : "			\
+		     << e.errorCode() << ":"				\
+		     << e.errorMessage() );				\
+      }									\
+    
+  //=====================================================================
+  
+  //=====================================================================
+#define UPDATEDB(UP)							\
+  try									\
+    {									\
+      GimmickMessage(2,"SQL update: '"<<UP<<"'"<<std::endl);		\
+      mDB->execDML(UP.c_str());						\
+    }									\
+  catch (CppSQLite3Exception& e)					\
+    {									\
+      GimmickError("SQLite update '"<<UP<<"' Error : "			\
+		   << e.errorCode() << ":"				\
+		   << e.errorMessage() );				\
+    }									
+  //=====================================================================
+
+
   //=====================================================================
   bool SQLiteTreeHandler::DBOpen()
   {
-    GimmickMessage(2,"Opening SQLite database '"<<GetFileName()<<std::endl);
+    GimmickMessage(1,"Opening SQLite database '"<<GetFileName()
+		   <<"' ... "<<std::endl);
     // OPENING FILE
     if (!boost::filesystem::exists(GetFileName())) 
       {
@@ -234,20 +276,19 @@ namespace creaImageIO
       }
     catch (CppSQLite3Exception& e)
       {
-	std::cerr << "Opening '"<<GetFileName()<<"' : "
-		  << e.errorCode() << ":" 
-		  << e.errorMessage() << std::endl;
+	GimmickError("Opening '"<<GetFileName()<<"' : "
+		     << e.errorCode() << ":" 
+		     << e.errorMessage());
 	return false;
       }
-    // TESTING STRUCTURE VALIDITY
-    if (!DBStructureIsValid())
+    // IMPORT TREE DESCRIPTION (AND TEST DB VALIDITY)
+    if (!DBImportTreeDescription())
       {
- 	std::cerr << "Opening '"<<GetFileName()<<"' : "
-		  << " invalid database structure" << std::endl;
 	return false;
       }
-    // IMPORTING NODE TYPE DESCRIPTIONS
-    DBImportTreeDescription();
+
+    GimmickDebugMessage(1,"Opening SQLite database '"<<GetFileName()
+		   <<"' ... OK"<<std::endl);
     return true;
   }
   //=====================================================================
@@ -255,13 +296,13 @@ namespace creaImageIO
   //=====================================================================
   bool SQLiteTreeHandler::DBCreate()
   {
-    //    std::cout << "### Creating SQLite database '"<<GetFileName()<<std::endl;
+    GimmickMessage(1,"Creating SQLite database '"<<GetFileName()
+		   <<"' ... "<<std::endl);
 
     if (boost::filesystem::exists(GetFileName())) 
       {
-	creaMessage("Gimmick!",1,
-		    "[Gimmick!] !! ERROR '"<<GetFileName()<<"' : "
-		    << "file already exists"<<std::endl);
+	GimmickError(GetFileName()<<"' : "
+		     << "file already exists");
 	return false;
       }
     
@@ -272,104 +313,74 @@ namespace creaImageIO
       }
     catch (CppSQLite3Exception& e)
       {
-	creaMessage("Gimmick!",1,
-		    "[Gimmick!] !! ERROR '"
-		    << e.errorCode() << ":" 
-		    << e.errorMessage() <<std::endl);
+	GimmickError(e.errorCode() << ":" 
+		     << e.errorMessage() <<std::endl);
 	return false;
       }
     
+     
     // CREATING TABLES
-    try
+    
+    std::string command;
+    // Create LEVELS table
+    command = "create table LEVELS\n";
+    command += "( Name text )\n";
+    UPDATEDB(command);
+    int l;
+    // Iterate the Levels
+    for (l=0; l<GetTree().GetNumberOfLevels(); l++)
       {
-	std::string command;
-	// Create LEVELS table
-	command = "create table LEVELS\n";
-	command += "( Name text )\n";
-	UPDATEDB(command);
-
-	// Level 0
-	command = "INSERT INTO Levels (Name) VALUES ('";
-	command += GetTree().GetLevelDescriptor(0).GetName();
+	command = "INSERT INTO LEVELS (Name) VALUES ('";
+	command += GetTree().GetLevelDescriptor(l).GetName();
 	command += "')";
 	UPDATEDB(command);
-
-	command = "CREATE TABLE ";
-	command += GetTree().GetLevelDescriptor(0).GetName();
-	command += "\n(\nID INTEGER PRIMARY KEY";
-	AppendAttributesSQLDefinition(0,command);
-	command += "\n)";
-	UPDATEDB(command);
 	
-	// Iterate the other Levels
-	for (int l=1; l<GetTree().GetNumberOfLevels(); ++l)
+	// Create table of level (for level>0, i.e. not Root)
+	if (l>=0)
 	  {
-	    command = "INSERT INTO LEVELS (Name) VALUES ('";
-	    command += GetTree().GetLevelDescriptor(l).GetName();
-	    command += "')";
-	    UPDATEDB(command);
-	    
 	    command = "CREATE TABLE ";
 	    command += GetTree().GetLevelDescriptor(l).GetName();
-	    command += "\n(\nID INTEGER PRIMARY KEY,\nPARENT_ID int not null";	
-	    AppendAttributesSQLDefinition(l,command);
-	    command +=",\n";
-	    command +="constraint FK_PARENT foreign key (PARENT_ID) references PATIENT(ID) on delete restrict on update restrict\n)";
+	    command += "\n(\nID INTEGER PRIMARY KEY";
+	    if (l>1) 
+	      {
+		command += ",\nPARENT_ID int not null";	
+	      }
+	    SQLAppendAttributesDefinition(l,command);
+	    if (l>1) 
+	      {
+		command += ",\nconstraint FK_PARENT foreign key (PARENT_ID) references ";
+		command += GetTree().GetLevelDescriptor(l-1).GetName();
+		command += "(ID) on delete restrict on update restrict";
+	      }
+	    command += "\n)";
 	    UPDATEDB(command);
+	    
+	    
+	    // Add Attribute 'ID' to Description
+	    GetTree().GetDescriptor().Add
+	      (AttributeDescriptor( "ID",
+				    "Database Identifier",
+				    0,0,
+				    AttributeDescriptor::PRIVATE
+				    ),l);
+	    
+	    if (l>1) 
+	      {
+		// Add Attribute 'PARENT_ID' to Description
+		GetTree().GetDescriptor().Add
+		  (AttributeDescriptor( "PARENT_ID",
+					"Database Parent Identifier",
+					0,0,
+					AttributeDescriptor::PRIVATE
+					),l);
+	      }
+	    
 	  }
 	
-	// Create tables *_ATTRIBUTES
-	// and fill the tables *_ATTRIBUTES
-	DBExportTreeDescription();
-	
-      }
-    catch (std::exception)
-      {
-	return false;
-      }
-    // LG : TEST
-    if (DBStructureIsValid())
-      {
-	//	std::cout << "*** DONE ***"<<std::endl;
-	//	mDBLoaded = true;
-	GetTree().SetChildrenLoaded(true);
-	return true;
-	
-      }
-    else 
-      {
-	//	std::cout << "*** AAAARRRRGGG ***"<<std::endl;
+	// Create table *_ATTRIBUTES
 	
-	return false;
-      }
-  }
-  //=====================================================================
-  
-  //=====================================================================
-  void SQLiteTreeHandler::AppendAttributesSQLDefinition(int level,
-							std::string& s)
-  {
-    LevelDescriptor::AttributeDescriptorListType::const_iterator i;
-    for (i  = GetTree().GetAttributeDescriptorList(level).begin();
-	 i != GetTree().GetAttributeDescriptorList(level).end();
-	 ++i)
-      {
-	//	if (i->second.flags==1) continue;
-	s += ",\n";
-	s += i->GetKey();
-	s += " text";
-      }
-  }
-  //=====================================================================
-  
-  //=====================================================================
-  void SQLiteTreeHandler::DBExportTreeDescription()
-  {
-    for (int level=0; level<GetTree().GetNumberOfLevels(); ++level)
-      {
-	std::string command;
 	command = "CREATE TABLE ";
-	command += GetTree().GetLevelDescriptor(level).GetName();
+	command += GetTree().GetLevelDescriptor(l).GetName();
 	command += "_Attributes\n(\n";
 	command += "Key text,\n";
 	command += "Name text,\n";	    
@@ -378,16 +389,18 @@ namespace creaImageIO
 	command += "Flags int\n";	    
 	command += "\n)";
 	UPDATEDB(command);
- 
+	
+	
+	// Fill the table *_ATTRIBUTES
 	LevelDescriptor::AttributeDescriptorListType::const_iterator i;
-	for (i  = GetTree().GetAttributeDescriptorList(level).begin();
-	     i != GetTree().GetAttributeDescriptorList(level).end();
+	for (i  = GetTree().GetAttributeDescriptorList(l).begin();
+	     i != GetTree().GetAttributeDescriptorList(l).end();
 	     ++i)
 	  {
 	    
 	    std::stringstream insert;
 	    insert << "INSERT INTO "
-		   << GetTree().GetLevelDescriptor(level).GetName()
+		   << GetTree().GetLevelDescriptor(l).GetName()
 		   << "_Attributes (Key,Name,DicomGroup,DicomElement,Flags) "
 		   << "VALUES ('"
 		   << i->GetKey() << "','"
@@ -395,167 +408,703 @@ namespace creaImageIO
 		   << i->GetGroup() << ","
 		   << i->GetElement() << ","
 		   << i->GetFlags() << ");";
-
 	    UPDATEDB(insert.str());
 	  }
-      }
+
+      } // For l=0...
+
+    // Initialize the root attributes
+    GetTree().InitializeAttributeMap();
+    // Insert the root in the level 0 table 
+    DBInsert(GetTree().GetTree());
+    
     
+    GetTree().SetChildrenLoaded(true);
+    GimmickMessage(1,"Creating SQLite database '"<<GetFileName()
+		   <<"' ... OK"<<std::endl);
+    return true;
   }
   //=====================================================================
   
   //=====================================================================
-  void SQLiteTreeHandler::DBImportTreeDescription()
+  void SQLiteTreeHandler::SQLAppendAttributesDefinition(int level,
+							std::string& s)
   {
-    GimmickMessage(3,"ImportTreeDescription"<<std::endl);
-    
-    //    tree::Description& desc = GetTree().GetDescription();
-    /*
+    LevelDescriptor::AttributeDescriptorListType::const_iterator i;
+    for (i  = GetTree().GetAttributeDescriptorList(level).begin();
+	 i != GetTree().GetAttributeDescriptorList(level).end();
+	 ++i)
+      {
+	//	if (i->second.flags==1) continue;
+	s += ",\n";
+	s += i->GetKey();
+	s += " text";
+      }
+  }
+  //=====================================================================
+  
+  
+  //=====================================================================
+  bool SQLiteTreeHandler::DBImportTreeDescription()
+  {
+    GimmickMessage(1,"Importing tree description from database ..."
+		   <<std::endl);
 
-    for (Node::Type type=Node::Patient; 
-	 type<=Node::Image; 
-	 type++)
+    // Test table 'LEVELS' existence
+    if ( ! mDB->tableExists("LEVELS") )
       {
-	std::string query = "SELECT * FROM ";
-	query += SQLiteTreeHandlerStructure::Table(type);
-	query += "_FIELDS";
+	GimmickMessage(1,"!! ERROR : Table 'LEVELS' does not exist"
+		       <<std::endl);
+	return false;
+      }
+
+    tree::Descriptor& desc = GetTree().GetDescriptor();
+    // clears the existing one
+    desc.Clear();
+     
+    int nblevel = 0;
+    std::string query = "SELECT * FROM LEVELS";
+    CppSQLite3Query q;
+    QUERYDB(query,q);
 
-	//	std::cout << "** SQL = '"<<query<<"'"<<std::endl;
+    while (!q.eof())
+      {
+	std::string name = q.getStringField(0);
+	GimmickMessage(2," * Importing level '"<<name<<"'"<<std::endl);
+	desc.Add(LevelDescriptor(name));
+	nblevel++;
+	q.nextRow();
+      }   
+    
+    for (int level = 0; level < nblevel; ++level )
+      {
+	std::string table = GetTree().GetLevelDescriptor(level).GetName();
+	table += "_Attributes";
+	// Test table 'LEVELS' existence
+	if ( ! mDB->tableExists(table.c_str()) )
+	  {
+	    GimmickMessage(1,"!! ERROR : Table '"<<table<<"' does not exist"
+			   <<std::endl);
+	    return false;
+	  }
 	
+	std::string query = "SELECT * FROM ";
+	query += table;
 	CppSQLite3Query q;
 	QUERYDB(query,q);
 	
+	GimmickMessage(2," * Level '"
+		       <<GetTree().GetLevelDescriptor(level).GetName()
+		       <<"'"<<std::endl);
+
+	// Test that ID and PARENT_ID mandatory attributes exist
+	bool ID_found = false;
+	bool PARENT_ID_found = false;
+	if (level==0) ID_found = true;
+	if (level<=1) PARENT_ID_found = true;
 
 	while (!q.eof())
 	  {
-	    Field::Description d(q.getStringField(0), // Key
-				 q.getIntField(1), // Group
-				 q.getIntField(2), // Element 
-				 q.getStringField(3), // Name
-				 q.getIntField(4) // Flags
-				 );
-	    GetNodeTypeDescription(type).GetFieldDescriptionMap()[d.key] = d;
-	    //	    std::cout << d << std::endl;
+	    std::string key(q.getStringField(0));
+	    std::string name(q.getStringField(1));
+	    GimmickMessage(2,"  - Importing attribute '"<<key<<"' '"<<name
+			   <<"'"<<std::endl);
+	    desc.Add
+	      (AttributeDescriptor( key, // Key
+				    name, // Name
+				    q.getIntField(2), // Group
+				    q.getIntField(3), // Element 
+				    q.getIntField(4) // Flags
+				    ),level);
+	    if ( key == "ID" ) 
+	      {
+		ID_found = true;
+	      }
+	    if ( key == "PARENT_ID" ) 
+	      {
+		PARENT_ID_found = true;
+	      }
 	    q.nextRow();
 	  }
+	
+	if ( ! (ID_found || PARENT_ID_found ) )
+	  {
+	    GimmickMessage(1,"!! ERROR : Table '"<<table
+			   <<"' does not contain mandatory attribute ID or PARENT_ID"
+			   <<std::endl);
+	    return false;
+ 
+	  }
       }
-    */
+
+
+    // Create the attributes table for Root (i.e. Tree)
+    LevelDescriptor::AttributeDescriptorListType::const_iterator a;
+    for (a = GetTree().GetAttributeDescriptorList(0).begin();
+	 a!= GetTree().GetAttributeDescriptorList(0).end();
+	 ++a)
+      {
+	/*
+	std::string v;
+	AttributeMapType::const_iterator i = attr.find(a->GetKey());
+	if ( i != attr.end() )  
+	  {
+	    v = i->second;
+	  }
+	*/
+	GetTree().UnsafeSetAttribute( a->GetKey(), "" );
+      }
+
+    // Reading Root attributes
+    // Query DB
+    query = "SELECT * FROM ";
+    query += GetTree().GetLevelDescriptor(0).GetName();
+    QUERYDB(query,q);
+
+    for (int fld = 0; fld < q.numFields(); fld++)
+      {
+	GetTree().UnsafeSetAttribute(q.fieldName(fld),
+				     q.getStringField(fld));	    
+      }
+
+    GimmickMessage(1,"Importing tree description from database ... OK"
+		   <<std::endl);
+    return true;
   }
   //=====================================================================
 
 
-    //=====================================================================
-  bool SQLiteTreeHandler::DBStructureIsValid()
-  {
-    bool success = true;
 
-    // TO DO : TABLE WHICH STORES THE LEVELS
-    /*
-    
-    for (int i = SQLiteTreeHandlerStructure::TableBegin();
-	 i    != SQLiteTreeHandlerStructure::TableEnd();++i)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  //========================================================================
+  /// 
+  std::string& SQLformat(std::string& str)
+  {
+    // quote must be doubled
+    boost::algorithm::replace_all(str,"'","''");
+    // Found strange strings which contained NULL char INSIDE string 
+    int i,size=str.size();
+    for (i=0;i<size;++i) 
       {
-	bool ok = mDB->tableExists(SQLiteTreeHandlerStructure::Table(i));
-	if (ok) 
+	if (str[i]==0) 
 	  {
-	    //	    std::cout << "** Table "<<SQLiteTreeHandlerStructure::Table(i)
-	    //		      <<" exists"<<std::endl;
-	    // TO DO : TEST MANDATORY FIELDS EXIST
+	    str = str.substr(0,i);
+	    break;
 	  }
-	else 
+      }
+    //    if (i<str.size())
+    return str;
+  }
+  //========================================================================
+  
+  //=====================================================================
+  void SQLiteTreeHandler::SQLAppendAttributesValues(tree::Node* n, 
+						    std::string& str)
+  {
+    GimmickMessage(4,"SQLAppendAttributesValues"<<std::endl);
+    std::string atts="";
+    std::string values="";
+    tree::Node::AttributeMapType::iterator i;
+    for (i =  n->GetAttributeMap().begin();
+	 i != n->GetAttributeMap().end();
+	 i++)
+      {
+	if (i->first=="ID") 
 	  {
-	    //	    std::cout << "** Table "<<SQLiteTreeHandlerStructure::Table(i)
-	    //		      <<" does *NOT* exist"<<std::endl;
-	    success = false;
+	    continue;
 	  }
+	//	std::cout << "("<<i->first<<","<<i->second<<")"<<std::endl;
+	atts += "'" + i->first + "'";
+	values += "'" + SQLformat(i->second) + "'"; 
+	atts += ",";
+	values += ",";
+	GimmickMessage(4,"'"<<i->first<<"' = '"<<i->second<<"'"<<std::endl);
       }
-    */
-    return success;
-  }  
+    atts[atts.size()-1]=' ';
+    values[values.size()-1]=' ';
+
+    str = "("+atts+") VALUES ("+values+")";
+    GimmickMessage(4,"Result = '"<<str<<"'"<<std::endl);
+  }
   //=====================================================================
 
-  /*
   //=====================================================================
-  int SQLiteTreeHandler::DBLoadChildren(Node* parent, 
-					int maxlevel)
+  tree::Node* SQLiteTreeHandler::DBGetParent( const AttributeMapType& attr) 
   {
-
-    //    std::cout << "SQLiteTreeHandler::DBLoadChildren("<<parent<<","<<maxlevel
-    //	      << ")"<<std::endl;
-    int nbloaded = 0;
-    if (parent == GetTree()) { parent = 0; }
-    Node* xparent = parent;
-    if ( xparent==0 ) xparent = GetTree();
-    if ( xparent->ChildrenLoaded() ) 
+    Node* parent = GetTree().GetTree();
+    bool go_down;
+    do 
       {
-	//	std::cout << "--> Children already loaded"<<std::endl;
-	return nbloaded;
-      }
-    if ( xparent->GetType() == Node::Image ) 
-      {
-	return nbloaded;
+	go_down = false;
+	// Load the children of the current parent
+	DBLoadChildren(parent);
+	// Iterate the children 
+	tree::Node::ChildrenListType::const_iterator i;
+	for (i = parent->GetChildrenList().begin();
+	     i!= parent->GetChildrenList().end();
+	     ++i)
+	  {
+	    if ( (*i)->Matches( attr ) ) 
+	      {
+		go_down = true;
+		parent = *i;
+		break;
+	      }
+	  }	
       }
-    if ( xparent->GetType() >= maxlevel ) 
+    while (go_down);
+    return parent;
+  }
+  //=====================================================================
+
+
+  //=====================================================================
+  int SQLiteTreeHandler::DBLoadChildren(tree::Node* node, 
+					int numberoflevels)
+  {
+    if (node->GetLevel()+1 >= node->GetTree()->GetNumberOfLevels() ) 
+      return 0;
+
+    GimmickMessage(2,"Loading children of '"<<node->GetLabel()
+		   <<"'"<<std::endl);
+
+    int nbloaded = 0;
+    // If children loaded we do not have to do it but we need to recurse
+    // in order to load the children's children if necessary, and so on...
+    if (node->GetChildrenLoaded()) 
       {
+	// Iterate the children 
+
+	tree::Node::ChildrenListType::iterator i;
+	for (i = node->GetChildrenList().begin();
+	     i!= node->GetChildrenList().end();
+	     ++i)
+	  {
+	    nbloaded += DBLoadChildren(*i,numberoflevels-1);
+	  }
+	node->SetChildrenLoaded(true);
 	return nbloaded;
-      }
-   
-    //    msw[2].Pause();
-    //    msw[2].Resume();
 
-    Node::Type type = xparent->GetType()+1;
+      }
+	else
+	{
+    /// If children not loaded : do it and recurse
 
     // Query DB
-
+    int level = node->GetLevel();
     std::string query = "SELECT * FROM ";
-    query += GetTree().GetDescriptor().GetLevelDescriptor(level).GetName();
-      //SQLiteTreeHandlerStructure::Table(type);
-    if (parent!=0)
+	
+    query += GetTree().GetLevelDescriptor(level+1).GetName();
+    if (level>0)
       {
-	query += " WHERE PARENT_ID='" + parent->GetFieldValue("ID") + "'";
+	query += " WHERE PARENT_ID='" + node->UnsafeGetAttribute("ID") 
+	  + "'";
       }
-
-    //    std::cout << "** SQL = '"<<query<<"'"<<std::endl;
-
     CppSQLite3Query q;
     QUERYDB(query,q);
 
+	int p=0;
     while (!q.eof())
       {
+
+	//	std::cout << "DBLoadCh : creating node level "<<level+1<<std::endl;
+
 	nbloaded++;
-	Node* n = new Node(type,
-			   this,xparent);
+	Node* n = new Node(node);
 	for (int fld = 0; fld < q.numFields(); fld++)
 	  {
-	    n->SetFieldValue(q.fieldName(fld),q.getStringField(fld));	    
+	    n->UnsafeSetAttribute(q.fieldName(fld),q.getStringField(fld));	    
 	  }
+	/*
 	// Index 
 	TypeId ti;
 	ti.type = type;
 	ti.id = n->GetFieldValue("ID");    
 	mTypeIdToNodeMap[ti] = n;
+	*/
 	// recurse 
-	if ( type < maxlevel ) 
+	if ( numberoflevels != 1 ) 
 	  {
-	    msw[2].Pause();
-	    nbloaded += DBLoadChildren(n,maxlevel);
-	    msw[2].Resume();
+	    //  msw[2].Pause();
+	    nbloaded += DBLoadChildren(n, numberoflevels-1);
+	    //	    msw[2].Resume();
 	  }
 	// next entry in db
 	q.nextRow();
       }
 
-    xparent->SetChildrenLoaded(true);
+    node->SetChildrenLoaded(true);
+	
     
     //    msw[2].Pause();
     return nbloaded;
+	}
+  }
+  //=====================================================================
+
+  //======================================================================
+  void SQLiteTreeHandler::DBInsert(tree::Node* n)
+  {
+    GimmickMessage(2,"Inserting in DB '"<<n->GetLabel()
+		   <<"'"<<std::endl);
+    std::string val;
+    SQLAppendAttributesValues(n,val);
+    std::string insert("INSERT INTO ");
+    insert += GetTree().GetLevelDescriptor(n->GetLevel()).GetName();
+    insert += " " + val + ";";
+
+    UPDATEDB(insert);
+	
+    // Store DB id of newly created node;
+    long lastrow = mDB->lastRowId();
+    std::stringstream ri;
+    ri << mDB->lastRowId();
+    n->SetAttribute("ID",ri.str());
+  }
+  //======================================================================
+
+  //======================================================================
+  /// Graft the branch defined by the attributes to the parent
+  void SQLiteTreeHandler::DBGraftToParent( tree::Node* parent, 
+					    const AttributeMapType& attr)
+  {
+    //    std::cout <<"Grafting to parent '"<<parent->GetLabel()
+    //		   <<"'"<<std::endl;
+
+    for (int level = parent->GetLevel()+1;
+	 level < GetTree().GetNumberOfLevels();
+	 level++)
+      {
+	// Create Node
+	tree::Node* child = new tree::Node(parent,attr);
+	child->SetChildrenLoaded(true);
+	if (level>1)
+	  {
+	    int nc = GetNumberOfChildren(parent)+1;
+	    
+	    //	std::cout<<"Number of children "<<parent->GetNumberOfChildren()<<std::endl;
+	    std::stringstream out;
+	    out << nc;
+	    SetAttribute(parent,"NumberOfChildren",out.str());
+	  }
+
+	// Set PARENT_ID if necessary 
+	if ( parent->GetLevel()>0 )
+	  child->SetAttribute("PARENT_ID",parent->GetAttribute("ID"));
+	
+	// Insert in DB
+	DBInsert(child);
+	/*
+	std::string val;
+	SQLAppendAttributesValues(child,val);
+	std::string insert("INSERT INTO ");
+	insert += GetTree().GetLevelDescriptor(child->GetLevel()).GetName();
+	insert += " " + val + ";";
+	UPDATEDB(insert);
+	
+	// Store DB id of newly created node;
+	long lastrow = mDB->lastRowId();
+	std::stringstream ri;
+	ri << mDB->lastRowId();
+	child->SetAttribute("ID",ri.str());
+	*/
+	// Down one level
+	parent = child;
+	
+	/*
+	// Insert in TypeId map
+	TypeId ti;
+	ti.type = node->GetType();
+	ti.id = node_id;
+	mTypeIdToNodeMap[ti] = node;
+	//    std::cout << "== Insert TypeId ("<<ti.type<<","<<ti.id<<")"<<std::endl; 
+	// 
+	msw[2].Pause();
+	
+	if (node->GetType()==Node::Patient) summary.added_patients++;
+	if (node->GetType()==Node::Study) summary.added_studies++;
+	if (node->GetType()==Node::Series) summary.added_series++;
+	if (node->GetType()==Node::Image) summary.added_images++;
+	*/
+      }
+  }
+  //======================================================================
+
+
+  //===================================================================== 
+  /// Sets an attribute of a Node
+  bool SQLiteTreeHandler::DBSetAttribute(tree::Node* n, 
+					 const std::string& key,
+					 const std::string& value)
+  {
+    GimmickMessage(3,"Setting Attribute of '"<<n->GetLabel()<<
+		   "' "<<key<<"='"<<value<<"'"<<std::endl);
+
+    n->SetAttribute(key,value);
+    std::string sql = "UPDATE ";
+    sql += GetTree().GetLevelDescriptor(n->GetLevel()).GetName();
+    sql += " SET ";
+    sql += key;
+    sql += " = '";
+    sql += value;
+    sql += "' WHERE ID = '";
+    sql += n->GetAttribute("ID");
+	sql +="'";
+    //    sql += " LIMIT 1";
+    UPDATEDB(sql);
+	return true;
+  }
+
+  //===================================================================== 
+  /// Sets an attribute of a Node
+  void SQLiteTreeHandler::DBSetAttribute(const std::string& levelDescriptor, 
+			      const std::string& key,
+			      const std::string& value,
+				  const std::string& searchParam, 
+				  const std::string& searchVal)
+  {
+
+    std::string sql = "UPDATE ";
+    sql += levelDescriptor;
+    sql += " SET ";
+    sql += key;
+    sql += " = '";
+    sql += value;
+    sql += "' WHERE ";
+	sql += searchParam;
+	sql += " = '";
+    sql += searchVal;
+	sql += "'";
+	std::cout<<sql<<std::endl;
+    UPDATEDB(sql);
+  }
+   //=====================================================================
+  void SQLiteTreeHandler::DBRecursiveRemoveNode(Node* node)
+  {
+       
+    std::string query = "DELETE FROM ";
+   
+    query += GetTree().GetLevelDescriptor(node->GetLevel()).GetName();
+    query += " WHERE ID='"+ node->GetAttribute("ID") + "';";
+ 
+    UPDATEDB(query);
+	GimmickDebugMessage(2,
+			    " Deleting '"
+				<<node->GetLabel()<<"' with ID '"
+			    <<node->GetAttribute("ID")
+			    <<"' in level "<< GetTree().GetLevelDescriptor(node->GetLevel()).GetName()
+			    <<std::endl);
+
+
+	if(node->GetNumberOfChildren()!=0)
+	{
+		Node::ChildrenListType::iterator i;
+		for (i  = node->GetChildrenList().begin();
+		i != node->GetChildrenList().end();
+		i++)
+		{
+		DBRecursiveRemoveNode((*i));
+		}
+	}
+	else if(node->GetLevel()<GetTree().GetNumberOfLevels()-1)
+	{
+		DBRecursiveRemoveNode(node->GetLevel()+1,node->GetAttribute("ID"));
+    }
   }
+
+  //=====================================================================
+  void SQLiteTreeHandler::DBRecursiveRemoveNode(int level, std::string parentId)
+  {
+    std::stringstream out;
+	std::stringstream result;
+	out<<"SELECT ID FROM "<<GetTree().GetLevelDescriptor(level).GetName()<<" WHERE PARENT_ID='"<<parentId<<"'";
+		
+	CppSQLite3Query q;
+	QUERYDB(out.str(),q);
+	
+	while (!q.eof())
+	  {
+	    for (int fld = 0; fld < q.numFields(); fld++)
+	      {
+			  result<<q.getStringField(fld)<<"#";
+	      }
+	    q.nextRow();
+	  }
+	  std::string res=result.str();
+	  size_t ini=0;
+	  size_t fin=0;
+	  while(fin<res.size()-1)
+	  {
+	   fin=res.find('#',ini);
+	   DBDelete(GetTree().GetLevelDescriptor(level).GetName(),"ID",res.substr(ini,fin-ini));
+	  if(level<GetTree().GetNumberOfLevels()-1)
+	  {
+		DBRecursiveRemoveNode(level+1,res.substr(ini,fin-ini));
+	  } 
+	   ini=fin+1;
+	  }
+	  
+    
+  }
+
   //=====================================================================
+  void SQLiteTreeHandler::DBDelete(std::string levelDescriptor, std::string key, std::string value)
+  {
+       
+    std::stringstream query;
+	query<<"DELETE FROM "<<levelDescriptor<<" WHERE "<<key<<"='"<<value<<"';";
+ 
+    UPDATEDB(query.str());
+	GimmickDebugMessage(2," Deleting: Query: "<<query.str()<<std::endl);
+  }
+
 
+  //===================================================================== 
+  void SQLiteTreeHandler::GetAttribute(std::string levelDescriptor,
+									   std::string searchParam, 
+									   std::string searchVal, 
+									   std::string key, 
+									   std::string& result) 
+  { 
+	std::stringstream out;
+	std::stringstream results;
+	out<<"SELECT "<<key<<" FROM "<<levelDescriptor;
+	if(searchParam!="")
+	{
+		out<<" WHERE "<<searchParam<<"='"<<searchVal<<"'";
+	}
+	
+	CppSQLite3Query q;
+	QUERYDB(out.str(),q);
+	
+	
+	while (!q.eof())
+	  {
+	    for (int fld = 0; fld < q.numFields(); fld++)
+	      {
+			  results<<q.getStringField(fld);
+			  if(searchParam=="")
+			  {
+				  results<<"#";
+			  }
+	      }
+	    q.nextRow();
+	  }
+	result=results.str();
+      
+  }
+  //===================================================================== 
+  unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
+  { 
+    // Query DB
+    int nb=0;
+    int level = n->GetLevel();
+
+    if(level<GetTree().GetNumberOfLevels()&& level>0)
+      {
+	std::string query = "SELECT NumberOfChildren FROM ";
+	query += GetTree().GetLevelDescriptor(level).GetName();
+	if (level>0)
+	  {
+	    query += " WHERE ID='" + n->UnsafeGetAttribute("ID") 
+	      + "'";
+	  }
+	CppSQLite3Query q;
+	QUERYDB(query,q);
+	
+	
+	while (!q.eof())
+	  {
+	    for (int fld = 0; fld < q.numFields(); fld++)
+	      {
+		nb=q.getIntField(fld);	
+	      }
+	    q.nextRow();
+	  }
+      }
+    /*
+    if(nb==0)
+      { 
+	nb=1;
+      }
+    */
+    return nb; 
+  }
 
+  //===================================================================== 
+  void SQLiteTreeHandler::GetTopLevelNodeId(const std::string& searchParam, const std::string& searchValue, std::string& parent_id) 
+  {
+	  int level=GetTree().GetNumberOfLevels()-1;
+	  std::string sp=searchParam.c_str();
+	  std::string sv=searchValue.c_str();
 
+	  while(level>1)
+	  {
+		std::stringstream out;
+		std::stringstream results;
+		out<<"SELECT PARENT_ID FROM "<<GetTree().GetLevelDescriptor(level).GetName();
+		out<<" WHERE "<<sp<<"='"<<sv<<"'";	
+		CppSQLite3Query q;
+		QUERYDB(out.str(),q);
+		
+		
+		while (!q.eof())
+		{
+			for (int fld = 0; fld < q.numFields(); fld++)
+			{
+				results<<q.getStringField(fld);
+			}
+			q.nextRow();
+		}
+		level=level-1;
+		sp="ID";
+		sv=results.str();
+	  }
+	  parent_id=sv;
 
+  }
 
+  //=====================================================================
+  void SQLiteTreeHandler::RemoveEntries(const std::string i_table, 
+		const std::string i_attribute, 
+		const std::string i_operand, 
+		const std::string i_val)
+    {
+        std::stringstream query;
+		query<<"DELETE  FROM "<<i_table<<" WHERE "<<i_attribute<<" "<<i_operand<<" '"<<i_val<<"'";
+        UPDATEDB(query.str());
+	}
+
+	//=====================================================================
+  void SQLiteTreeHandler::BeginTransaction()
+    {
+		std::stringstream out;
+		out<<"begin transaction;";
+        UPDATEDB(out.str());
+	}
+
+	//=====================================================================
+  void SQLiteTreeHandler::EndTransaction()
+    {
+       std::stringstream out;
+		out<<"commit transaction;";
+        UPDATEDB(out.str());
+	}
 
+  /*
   //=====================================================================
   bool SQLiteTreeHandler::DBInsert(Node* alien_node,
 				   UpdateSummary& summary)
@@ -841,12 +1390,14 @@ namespace creaImageIO
     //    std::cout << " ** Node = "<<i->second<<std::endl;
     return i->second;
   }
+ 
   //=====================================================================
 
   //=====================================================================
   bool SQLiteTreeHandler::Remove(Node* node)
   {
-    DBRecursiveRemoveNode(node);
+
+    //DBRecursiveRemoveNode(node);
  
     //    std::cout << "DELETE"<<std::endl;
     if (node->GetParent())
@@ -857,6 +1408,8 @@ namespace creaImageIO
     //    std::cout << "DELETE OK"<<std::endl;
     return true;
   }
+  
+  
   //========================================================================
 
   //=====================================================================
@@ -879,6 +1432,7 @@ namespace creaImageIO
 	DBRecursiveRemoveNode((*i));
       }
   }
+  
   //=====================================================================
   
   //=====================================================================
@@ -903,57 +1457,8 @@ namespace creaImageIO
   }
   //=====================================================================
  
-  //========================================================================
-  std::string& format_sql2(std::string& str)
-  {
-    // quote must be doubled
-    //    crea::Utils::Replace( str, "'", "''" );
-    boost::algorithm::replace_all(str,"'","''");
-    // Found strange strings which contained NULL char INSIDE string 
-    int i,size=str.size();
-    for (i=0;i<size;++i) 
-      {
-	if (str[i]==0) 
-	  {
-	    str = str.substr(0,i);
-	    break;
-	  }
-      }
-    //    if (i<str.size())
-    return str;
-  }
-   //========================================================================
-
-  //=====================================================================
-  void SQLiteTreeHandler::BuildSQLFieldsValues(Node* n,
-					std::string& str)
-  {
-    //    std::cout << "BuildSQLFieldsValues('"<<n->GetLabel()<<"')"<<std::endl;
-
-    std::string atts="";
-    std::string values="";
-    Node::FieldValueMapType::iterator i;
-    for (i =  n->GetFieldValueMap().begin();
-	 i != n->GetFieldValueMap().end();
-	 i++)
-      {
-	if (i->first=="ID") 
-	  {
-	    continue;
-	  }
-	//	std::cout << "("<<i->first<<","<<i->second<<")"<<std::endl;
-	atts += "'" + i->first + "'";
-	values += "'" + format_sql2(i->second) + "'"; 
-	atts += ",";
-	values += ",";
-      }
-    atts[atts.size()-1]=' ';
-    values[values.size()-1]=' ';
-
-    str = "("+atts+") VALUES ("+values+")";
+ 
 
-  }
-  //=====================================================================
 */