Reemplaza <> por [] en la documentación para que no se vuelva loco el HTML.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 0ad4961a83c0b3037c949156e408eca492c7a1f9..e78a91e406688633f1818fad4464e9776f9b8c03 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -35,6 +35,20 @@ BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt,
 
 BTree::BTree (const std::string &name)
 {
 
 BTree::BTree (const std::string &name)
 {

+       /* Leo los bloques recuperables */
+       std::string del = filename + ".del";
+
+       fp = fopen (del.c_str (), "wb");
+       if (fp != NULL) {
+               uint i;
+
+               while (fread (&i, 1, sizeof (uint), fp)) {
+                       deleted_nodes.push_back (i);
+               }
+
+               fclose (fp);
+       }
+

        fp = fopen (name.c_str(), "rb+");
        if (!fp) {
                /* TODO : mandar una exception ? */
        fp = fopen (name.c_str(), "rb+");
        if (!fp) {
                /* TODO : mandar una exception ? */


@@ -46,6 +60,19 @@ BTree::BTree (const std::string &name)
 BTree::~BTree ()
 {
        fclose (fp);
 BTree::~BTree ()
 {
        fclose (fp);

+
+       std::string del = filename + ".del";
+
+       fp = fopen (del.c_str (), "wb");
+       std::list<uint>::iterator it = deleted_nodes.begin ();
+
+       while (it != deleted_nodes.end ()) {
+               uint i = *it;
+               fwrite (&i, 1, sizeof (uint), fp);
+               it++;
+       }
+
+       fclose (fp);

 }
 
 void BTree::ReadFileHeader ()
 }
 
 void BTree::ReadFileHeader ()


@@ -1154,9 +1181,9 @@ uchar *BTree::NewBlock (uint &num)
        BTreeNodeHeader nh;
 
        std::list<uint>::iterator it;
        BTreeNodeHeader nh;
 
        std::list<uint>::iterator it;

-       it = deleted_nodes.begin ();

 
 

-       if (it != deleted_nodes.end ()) {
+       if (deleted_nodes.size ()) {
+               it = deleted_nodes.begin ();

                num = *it;
                deleted_nodes.erase (it);
        } else {
                num = *it;
                deleted_nodes.erase (it);
        } else {