Poniendole forma al Agregar.

[z.facultad/75.52/treemulator.git] / src / btree.cpp

diff --git a/src/btree.cpp b/src/btree.cpp
index dd0551d378af6bc84198bd5620139dc5bface11d..fc0a5e926f27973bb60c2c82619d4f4d8551e0a4 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -63,16 +63,36 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num)
        BTreeNodeHeader node_header;
        ReadNodoHeader (node, &node_header);
 
+       if (node_header.level != 0) {
+               /* No estoy en una hoja, asi que tengo que buscar
+                * para donde moverme para agregar la clave
+                */
+               /* TODO :) */
+       }
+
+
+       /* Estoy en una hoja, veo si lo puedo agregar */
        BTreeLeafData data (k->Clone ());
 
        if (node_header.free_space > data.Size ()) {
                /* TODO : Insertar ordenado */
-               node_keys = ReadKeys (node, node_header);
-               node_keys.push_back (data);
+               BTreeData datait;
 
+               node_keys = ReadKeys (node, node_header);
+               std::list<BTreeData>::iterator it = node_keys.begin ();
+
+               while (it != node_keys.end ()) {
+                       datait = (*it);
+                       if (data < datait)
+                               /* Me pase, lo agrego aca! */
+                               break;
+               }
+               node_keys.insert (it, data);
                WriteKeys (node, node_header, node_keys);
                WriteNodoHeader (node, &node_header);
                WriteBlock (node, node_num);
+
+               PrintNode (node_num);
        } else {
                /* Split */
                /* Lo que debe pasar :
@@ -152,3 +172,23 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
 
        /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
 }
+               
+void BTree::PrintNode (uint num)
+{
+       uchar *node = ReadBlock (num);
+       BTreeNodeHeader node_header;
+       ReadNodoHeader (node, &node_header);
+               
+       std::list<BTreeData> node_keys = ReadKeys (node, node_header);
+       std::list<BTreeData>::iterator it = node_keys.begin ();
+
+       std::cout << "Nodo  : " << num << std::endl;
+       std::cout << "Items : " << node_header.item_count << std::endl;
+       std::cout << "Free  : " << node_header.free_space << " (" << (header.block_size - sizeof (BTreeNodeHeader)) << ")" << std::endl;
+       while (it != node_keys.end ()) {
+               std::string s = (*it);
+               std::cout << "(" << s << ") "; 
+       }
+       std::cout << std::endl;
+}
+