Fix de grupos para los RADIO.

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

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index a5d9b6805706311ca288279c5030f83f582adb22..1adeb8303d18aec14e4a01b4679126e5bdd17279 100644 (file)
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -24,6 +24,10 @@ BTreeData::BTreeData (Clave *k, uint child)
 
 BTreeData::~BTreeData ()
 {
 
 BTreeData::~BTreeData ()
 {

+       if (clave) {
+               delete clave;
+               clave = NULL;
+       }

 }
 
 uint BTreeData::Size () const
 }
 
 uint BTreeData::Size () const


@@ -38,8 +42,10 @@ uchar* BTreeData::ToArray () const
 {
        uchar *out = new uchar[Size()];
        if (clave) {
 {
        uchar *out = new uchar[Size()];
        if (clave) {

-               memcpy (out, clave->ToArray (), clave->Size ());
+               uchar *n = clave->ToArray ();
+               memcpy (out, n, clave->Size ());

                memcpy (out+clave->Size (), &hijo, sizeof (uint));
                memcpy (out+clave->Size (), &hijo, sizeof (uint));

+               delete [] n;

        } else
                memcpy (out, &hijo, sizeof (uint));
        return out;
        } else
                memcpy (out, &hijo, sizeof (uint));
        return out;


@@ -59,8 +65,25 @@ bool BTreeData::operator == (const BTreeData &data) const
        return (*clave) == (*(data.clave));
 }
 
        return (*clave) == (*(data.clave));
 }
 

+bool BTreeData::Abrev (BTreeData *anterior)
+{
+       if (anterior == NULL) return false;
+
+       ClaveVariable *c = (ClaveVariable *)clave;
+       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));
+}
+
+bool BTreeData::DesAbrev (BTreeData *anterior)
+{
+       if (anterior == NULL) return false;
+
+       ClaveVariable *c = (ClaveVariable *)clave;
+       return c->DesAbrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));
+}
+

 BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 {
 BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 {

+       hijo = 0;       

        if (key_type == BTree::KEY_FIXED)
                clave = new ClaveFija (node);
        else
        if (key_type == BTree::KEY_FIXED)
                clave = new ClaveFija (node);
        else


@@ -69,6 +92,10 @@ BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 
 BTreeLeafData::~BTreeLeafData ()
 {
 
 BTreeLeafData::~BTreeLeafData ()
 {

+       if (clave) {
+               delete clave; 
+               clave = NULL;
+       }

 }
 
 uint BTreeLeafData::Size () const
 }
 
 uint BTreeLeafData::Size () const


@@ -88,6 +115,7 @@ uchar* BTreeLeafData::ToArray () const
 BTreeChildData::BTreeChildData (uchar *node)
 {
        memcpy (&hijo, node, sizeof (uint));
 BTreeChildData::BTreeChildData (uchar *node)
 {
        memcpy (&hijo, node, sizeof (uint));

+       clave = NULL;

 }
 
 BTreeChildData::~BTreeChildData ()
 }
 
 BTreeChildData::~BTreeChildData ()


@@ -106,3 +134,7 @@ uchar* BTreeChildData::ToArray () const
        return out;
 }
 
        return out;
 }
 

+bool BTreeChildData::operator < (const BTreeData &data) const
+{
+       return false;
+}