Fixed number of children algorithm and repetition of nodes on add directory.

[creaImageIO.git] / src2 / creaImageIOSQLiteTreeHandler.cpp

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 7d9f7ef4587ffeffbfb42abac854f05dff4666ff..4363e7c0a99de19d39fc44b4e0570f0598a9496d 100644 (file)
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -126,13 +126,13 @@ namespace creaImageIO
   }
   //===================================================================== 
 
-
   //===================================================================== 
   int SQLiteTreeHandler::AddBranch( const AttributeMapType& attr )
   {
     tree::Node* parent = DBGetParent(attr);
     DBGraftToParent(parent,attr);
     return (parent->GetLevel()+1);
+         
   }
   //===================================================================== 
  
@@ -381,7 +381,6 @@ namespace creaImageIO
                   << i->GetGroup() << ","
                   << i->GetElement() << ","
                   << i->GetFlags() << ");";
-           
            UPDATEDB(insert.str());
          }
 
@@ -661,14 +660,16 @@ namespace creaImageIO
     if (node->GetChildrenLoaded()) 
       {
        // Iterate the children 
-       tree::Node::ChildrenListType::iterator i;
+
+       /*tree::Node::ChildrenListType::iterator i;
        for (i = node->GetChildrenList().begin();
             i!= node->GetChildrenList().end();
             ++i)
          {
            nbloaded += DBLoadChildren(*i,numberoflevels-1);
-         }
+         }*/
        return nbloaded;
+
       }
     
     /// If children not loaded : do it and recurse
@@ -688,6 +689,7 @@ namespace creaImageIO
 
     while (!q.eof())
       {
+       //        std::cout<<"Name in q: "<<q.fieldName(3)<<" Value: "<<q.getStringField(3)<<std::endl;
        nbloaded++;
        Node* n = new Node(node);
        for (int fld = 0; fld < q.numFields(); fld++)
@@ -705,7 +707,7 @@ namespace creaImageIO
        if ( numberoflevels != 1 ) 
          {
            //  msw[2].Pause();
-           nbloaded += DBLoadChildren(n, numberoflevels-1);
+       //    nbloaded += DBLoadChildren(n, numberoflevels-1);
            //      msw[2].Resume();
          }
        // next entry in db
@@ -848,8 +850,6 @@ namespace creaImageIO
       }
   }
 
-  //=====================================================================
-
   //===================================================================== 
   unsigned int SQLiteTreeHandler::GetNumberOfChildren(tree::Node* n) 
   {