X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/2ab8041933e77875de62bc73e76febc528af258e..ea5776d090486ba7895940545e8dff58d558a7d3:/src/btree_data.cpp

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index a5d9b68..1adeb83 100644
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -24,6 +24,10 @@ BTreeData::BTreeData (Clave *k, uint child)
 
 BTreeData::~BTreeData ()
 {
+	if (clave) {
+		delete clave;
+		clave = NULL;
+	}
 }
 
 uint BTreeData::Size () const
@@ -38,8 +42,10 @@ uchar* BTreeData::ToArray () const
 {
 	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));
+		delete [] n;
 	} else
 		memcpy (out, &hijo, sizeof (uint));
 	return out;
@@ -59,8 +65,25 @@ bool BTreeData::operator == (const BTreeData &data) const
 	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)
 {
+	hijo = 0;	
 	if (key_type == BTree::KEY_FIXED)
 		clave = new ClaveFija (node);
 	else
@@ -69,6 +92,10 @@ BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 
 BTreeLeafData::~BTreeLeafData ()
 {
+	if (clave) {
+		delete clave; 
+		clave = NULL;
+	}
 }
 
 uint BTreeLeafData::Size () const
@@ -88,6 +115,7 @@ uchar* BTreeLeafData::ToArray () const
 BTreeChildData::BTreeChildData (uchar *node)
 {
 	memcpy (&hijo, node, sizeof (uint));
+	clave = NULL;
 }
 
 BTreeChildData::~BTreeChildData ()
@@ -106,3 +134,7 @@ uchar* BTreeChildData::ToArray () const
 	return out;
 }
 
+bool BTreeChildData::operator < (const BTreeData &data) const
+{
+	return false;
+}