X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOSQLiteTreeHandler.cpp;h=26a9641d92247dbe21f04aac67008cc4718f5683;hb=d650256e38052b06baf671b027b855a1ad27f578;hp=3a01e117f8a78f3861ede83c5200f4e054f57e8c;hpb=ff9cfd68812d5dd296fa71fbcc21e7e867d4da23;p=creaImageIO.git

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 3a01e11..26a9641 100644
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -36,6 +36,7 @@ namespace creaImageIO
     : mFileName(filename)
   {
     mDB = new CppSQLite3DB;
+	mIsAdding=false;
     GimmickMessage(1,"SQLite version : "
 		   <<std::string(mDB->SQLiteVersion())<< std::endl);
   }
@@ -106,13 +107,7 @@ namespace creaImageIO
   {
     return false;
   }
-  //=====================================================================
-
-  //===================================================================== 
-  unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
-  { 
-    return 0; 
-  }
+  
   //===================================================================== 
 
   //===================================================================== 
@@ -132,13 +127,21 @@ namespace creaImageIO
   }
   //===================================================================== 
 
-
   //===================================================================== 
   int SQLiteTreeHandler::AddBranch( const AttributeMapType& attr )
   {
     tree::Node* parent = DBGetParent(attr);
     DBGraftToParent(parent,attr);
+	if(parent->GetLevel()<GetTree().GetNumberOfLevels()-1&&parent->GetLevel()>0)
+	{
+	int nC=GetNumberOfChildren(parent);
+	nC=nC+1;
+	std::stringstream out;
+	out <<nC;
+	SetAttribute(parent,"NumberOfChildren",out.str());
+	}
     return (parent->GetLevel()+1);
+	  
   }
   //===================================================================== 
  
@@ -149,11 +152,30 @@ namespace creaImageIO
    DBRecursiveRemoveNode(node);
  
     //    std::cout << "DELETE"<<std::endl;
-    if (node->GetParent())
+   bool remove=false;
+   tree::Node* parent=node->GetParent();
+    if (parent)
       {
-	node->GetParent()->RemoveChildrenFromList(node);
+	parent->RemoveChildrenFromList(node);
+	int nC=GetNumberOfChildren(parent);
+	nC=nC-1;
+	if(nC>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;
    }
@@ -336,22 +358,22 @@ namespace creaImageIO
 	    
 	    
 	    // Add Attribute 'ID' to Description
-	    GetTree().GetLevelDescriptor(l).Add
+	    GetTree().GetDescriptor().Add
 	      (AttributeDescriptor( "ID",
 				    "Database Identifier",
 				    0,0,
 				    AttributeDescriptor::PRIVATE
-				    ));
+				    ),l);
 	    
 	    if (l>1) 
 	      {
 		// Add Attribute 'PARENT_ID' to Description
-		GetTree().GetLevelDescriptor(l).Add
+		GetTree().GetDescriptor().Add
 		  (AttributeDescriptor( "PARENT_ID",
 					"Database Parent Identifier",
 					0,0,
 					AttributeDescriptor::PRIVATE
-					));
+					),l);
 	      }
 	    
 	  }
@@ -387,7 +409,6 @@ namespace creaImageIO
 		   << i->GetGroup() << ","
 		   << i->GetElement() << ","
 		   << i->GetFlags() << ");";
-	    
 	    UPDATEDB(insert.str());
 	  }
 
@@ -440,7 +461,7 @@ namespace creaImageIO
 
     tree::Descriptor& desc = GetTree().GetDescriptor();
     // clears the existing one
-    desc.GetLevelDescriptorList().clear();
+    desc.Clear();
      
     int nblevel = 0;
     std::string query = "SELECT * FROM LEVELS";
@@ -451,7 +472,7 @@ namespace creaImageIO
       {
 	std::string name = q.getStringField(0);
 	GimmickMessage(2," * Importing level '"<<name<<"'"<<std::endl);
-	desc.GetLevelDescriptorList().push_back(LevelDescriptor(name));
+	desc.Add(LevelDescriptor(name));
 	nblevel++;
 	q.nextRow();
       }   
@@ -489,13 +510,13 @@ namespace creaImageIO
 	    std::string name(q.getStringField(1));
 	    GimmickMessage(2,"  - Importing attribute '"<<key<<"' '"<<name
 			   <<"'"<<std::endl);
-	    desc.GetLevelDescriptor(level).Add
+	    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;
@@ -667,6 +688,7 @@ namespace creaImageIO
     if (node->GetChildrenLoaded()) 
       {
 	// Iterate the children 
+
 	tree::Node::ChildrenListType::iterator i;
 	for (i = node->GetChildrenList().begin();
 	     i!= node->GetChildrenList().end();
@@ -674,14 +696,18 @@ namespace creaImageIO
 	  {
 	    nbloaded += DBLoadChildren(*i,numberoflevels-1);
 	  }
+	node->SetChildrenLoaded(true);
 	return nbloaded;
+
       }
-    
+	else
+	{
     /// If children not loaded : do it and recurse
 
     // Query DB
     int level = node->GetLevel();
     std::string query = "SELECT * FROM ";
+	
     query += GetTree().GetLevelDescriptor(level+1).GetName();
     if (level>0)
       {
@@ -691,8 +717,12 @@ namespace creaImageIO
     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(node);
 	for (int fld = 0; fld < q.numFields(); fld++)
@@ -718,9 +748,11 @@ namespace creaImageIO
       }
 
     node->SetChildrenLoaded(true);
+	
     
     //    msw[2].Pause();
     return nbloaded;
+	}
   }
   //=====================================================================
 
@@ -750,8 +782,8 @@ namespace creaImageIO
   void SQLiteTreeHandler::DBGraftToParent( tree::Node* parent, 
 					    const AttributeMapType& attr)
   {
-    GimmickMessage(2,"Grafting to parent '"<<parent->GetLabel()
-		   <<"'"<<std::endl);
+    //    std::cout <<"Grafting to parent '"<<parent->GetLabel()
+    //		   <<"'"<<std::endl;
 
     for (int level = parent->GetLevel()+1;
 	 level < GetTree().GetNumberOfLevels();
@@ -759,7 +791,10 @@ namespace creaImageIO
       {
 	// Create Node
 	tree::Node* child = new tree::Node(parent,attr);
-	
+	GetNumberOfChildren(parent);
+	child->SetChildrenLoaded(true);
+	//	std::cout<<"Number of children "<<parent->GetNumberOfChildren()<<std::endl;
+
 	// Set PARENT_ID if necessary 
 	if ( parent->GetLevel()>0 )
 	  child->SetAttribute("PARENT_ID",parent->GetAttribute("ID"));
@@ -853,6 +888,39 @@ namespace creaImageIO
       }
   }
 
+  //===================================================================== 
+  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; 
+  }
+
   /*
   //=====================================================================
   bool SQLiteTreeHandler::DBInsert(Node* alien_node,