Recuperacion de nodos eliminados.

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

diff --git a/src/clave_variable.cpp b/src/clave_variable.cpp
index 48a42a60b5d8cddd6f9ade59fc0873f00ca622ef..c97b9d9609c8c3ed256138d2c616b3b7cf3a459c 100644 (file)
--- a/src/clave_variable.cpp
+++ b/src/clave_variable.cpp
@@ -3,9 +3,10 @@
 #include "clave_variable.h"
 #include <iostream>
 
 #include "clave_variable.h"
 #include <iostream>
 

-ClaveVariable::ClaveVariable (const std::string &s)
+ClaveVariable::ClaveVariable (const std::string &s, uint bd)

 {
        data = s;
 {
        data = s;

+       block_data = bd;

 }
 
 ClaveVariable::ClaveVariable (uchar *n)
 }
 
 ClaveVariable::ClaveVariable (uchar *n)


@@ -19,12 +20,15 @@ ClaveVariable::ClaveVariable (uchar *n)
        str[len] = '\0';
        data = std::string ((const char *)(str));
        delete [] str;
        str[len] = '\0';
        data = std::string ((const char *)(str));
        delete [] str;

+       n += data.size () * sizeof (uchar);
+       memcpy (&block_data, n, sizeof (uint));
+

        raw_data = data;
 }
 
 uint ClaveVariable::Size () const
 {
        raw_data = data;
 }
 
 uint ClaveVariable::Size () const
 {

-       return data.size ()*sizeof (uchar)+sizeof (uint);
+       return data.size ()*sizeof (uchar)+sizeof (uint)*2;

 }
 
 uchar *ClaveVariable::ToArray () const
 }
 
 uchar *ClaveVariable::ToArray () const


@@ -32,8 +36,13 @@ uchar *ClaveVariable::ToArray () const
        uchar *out;
        uint len = data.size ();
        out = new uchar[Size ()];
        uchar *out;
        uint len = data.size ();
        out = new uchar[Size ()];

+       int x = 0;

        memcpy (out, &len, sizeof (uint));
        memcpy (out, &len, sizeof (uint));

-       memcpy (out+sizeof(uint), data.c_str (), data.size ()*sizeof (uchar));
+       x += sizeof (uint);
+       memcpy (out+x, data.c_str (), data.size ()*sizeof (uchar));
+       x += data.size () * sizeof (uchar);
+       memcpy (out+x, &block_data, sizeof (uint));
+

        return out;
 }
 
        return out;
 }