El block_data ahora es manejado por BTree.

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

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

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

 {
        data = s;
 {
        data = s;

-       block_data = bd;

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


@@ -124,12 +123,24 @@ std::string ClaveVariable::abreviar(std::string &p, std::string &a, int &iguales
 
 uchar *ClaveVariable::ToRaw (uint &size) const
 {
 
 uchar *ClaveVariable::ToRaw (uint &size) const
 {

-       uchar *out;
-       size = raw_data.size ()*sizeof (uchar)+sizeof (uint);
-       uint len = raw_data.size ();
-       out = new uchar[size];
-       memcpy (out, &len, sizeof (uint));
-       memcpy (out+sizeof(uint), raw_data.c_str (), raw_data.size ()*sizeof (uchar));
+       std::stringstream ss;
+
+       ss << "[";
+       ss << data.size ();
+       ss << "]";
+       ss << "[";
+       ss << raw_data;
+       ss << "]";
+       ss << "[";
+       ss << block_data;
+       ss << "]";
+
+       std::string s = ss.str ();
+
+       uchar *out = new uchar[s.size ()];
+       memcpy (out, s.c_str (), s.size ());
+
+       size = s.size ();

        return out;
 }
 
        return out;
 }