Agrego ToRaw a las claves.

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

diff --git a/src/clave_variable.cpp b/src/clave_variable.cpp
index 47d81ba5f292f1b2461b8b26f02f6d6a8bb816e1..48a42a60b5d8cddd6f9ade59fc0873f00ca622ef 100644 (file)
--- a/src/clave_variable.cpp
+++ b/src/clave_variable.cpp
@@ -19,11 +19,12 @@ 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;

+       raw_data = data;

 }
 
 uint ClaveVariable::Size () const
 {
 }
 
 uint ClaveVariable::Size () const
 {

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

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


@@ -32,7 +33,7 @@ uchar *ClaveVariable::ToArray () const
        uint len = data.size ();
        out = new uchar[Size ()];
        memcpy (out, &len, sizeof (uint));
        uint len = data.size ();
        out = new uchar[Size ()];
        memcpy (out, &len, sizeof (uint));

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

        return out;
 }
 
        return out;
 }
 


@@ -82,7 +83,6 @@ bool ClaveVariable::DesAbrev (ClaveVariable *c)
        if (pos <= 0) return false;
 
        std::string siguales = data.substr (0, pos);
        if (pos <= 0) return false;
 
        std::string siguales = data.substr (0, pos);

-       std::cout << siguales << std::endl;

        int iguales = atoi (siguales.c_str ());
 
        std::string primera_parte = c->data.substr (0, iguales);
        int iguales = atoi (siguales.c_str ());
 
        std::string primera_parte = c->data.substr (0, iguales);


@@ -113,3 +113,14 @@ std::string ClaveVariable::abreviar(std::string &p, std::string &a, int &iguales
        return std::string (actual);
 }
 
        return std::string (actual);
 }
 

+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));
+       return out;
+}
+