Agrega Makefile a doc/.

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

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index b74427bbbb56755d957f74b5d9e8c8c880110f32..1adeb8303d18aec14e4a01b4679126e5bdd17279 100644 (file)
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -70,7 +70,7 @@ bool BTreeData::Abrev (BTreeData *anterior)
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;

-       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->getClave ()));
+       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));

 }
 
 bool BTreeData::DesAbrev (BTreeData *anterior)
 }
 
 bool BTreeData::DesAbrev (BTreeData *anterior)


@@ -78,11 +78,12 @@ bool BTreeData::DesAbrev (BTreeData *anterior)
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;

-       return c->DesAbrev (dynamic_cast<ClaveVariable *>(anterior->getClave ()));
+       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


@@ -114,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 ()


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

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