X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/3a9e92af5fe004d068e161c66e308e4401dfc21b..2c1d3ea3cf9a25e8f957587d4a1581fc292c831b:/src/btree.cpp

diff --git a/src/btree.cpp b/src/btree.cpp
index 9591ec8..cf01b2c 100644
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -17,7 +17,7 @@ BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_
 	
 	/* Inicializo el header */
 	header.block_size = block_size;
-	write_tree_header ();
+	WriteFileHeader ();
 
 	/* Creo el primer bloque vacio */
 	node = new uchar[block_size];
@@ -26,7 +26,7 @@ BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_
 	nh.free_space = block_size - sizeof (BTreeNodeHeader);
 	nh.item_count = 0;
 	WriteNodoHeader (node, &nh);
-	write_block (node, 0);
+	WriteBlock (node, 0);
 
 	delete [] node;
 }
@@ -36,13 +36,13 @@ BTree::~BTree ()
 	fclose (fp);
 }
 
-void BTree::write_tree_header ()
+void BTree::WriteFileHeader ()
 {
 	fseek (fp, 0L, SEEK_SET);
 	fwrite (&header, 1, sizeof (BTreeFileHeader), fp);
 }
 
-void BTree::write_block (uchar *block, uint num)
+void BTree::WriteBlock (uchar *block, uint num)
 {
 	fseek (fp, num*header.block_size + sizeof (BTreeFileHeader), SEEK_SET);
 	fwrite (block, 1, header.block_size, fp);
@@ -50,23 +50,36 @@ void BTree::write_block (uchar *block, uint num)
 
 void BTree::AddKey (const Clave &k)
 {
-	std::list<Clave *> node_keys;
+	AddKeyR (&k, 0);
+}
+
+Clave* BTree::AddKeyR (const Clave *k, uint node_num)
+{
+	Clave *kout;
+	std::list<BTreeData> node_keys;
 
 	/* Leo el nodo raiz para empezar a agregar */
-	uchar *root = ReadBlock (0);
-	BTreeNodeHeader root_header;
-	ReadNodoHeader (root, &root_header);
+	uchar *node = ReadBlock (node_num);
+	BTreeNodeHeader node_header;
+	ReadNodoHeader (node, &node_header);
 
-	node_keys = ReadKeys (root, root_header);
-	std::cout << node_keys.size () << std::endl;
+	node_keys = ReadKeys (node, node_header);
 	
-	if (root_header.free_space >= k.Size ()) {
-		std::cout << "Hay lugar para meter la clave" << std::endl;
+	if (node_header.free_space >= k->Size ()) {
+		/* TODO : Insertar ordenado */
+		//node_keys.push_back (BTreek->Clone ());
 	} else {
-		std::cout << "__NO__ hay lugar para meter la clave" << std::endl;
+		/* Split */
 	}
 
-	delete [] root;
+	
+	WriteKeys (node, node_header, node_keys);
+	WriteNodoHeader (node, &node_header);
+	WriteBlock (node, node_num);
+
+	delete [] node;
+
+	return kout;
 }
 
 void BTree::DelKey (const Clave &k) {}
@@ -91,9 +104,9 @@ uchar *BTree::ReadBlock (uint num)
 	return out;
 }
 
-std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
+std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
 {
-	std::list<Clave *> keys;
+	std::list<BTreeData> keys;
 	node += sizeof (BTreeNodeHeader);
 
 	for (uint i=0; i<node_header.item_count; i++) {
@@ -101,24 +114,25 @@ std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
 		 * dependiendo de algun dato en el header del
 		 * arbol
 		 */
-		ClaveFija *k = new ClaveFija (node);
-		node += k->Size ();
-		keys.push_back (k);
+		/* TODO : Detectar si estoy en una hoja */
+		BTreeData data(node);
+		node += data.Size ();
+		keys.push_back (data);
 	}
 
 	return keys;
 }
 
-void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<Clave *> &keys)
+void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData> &keys)
 {
-	std::list<Clave *>::iterator it = keys.begin ();
+	std::list<BTreeData>::iterator it = keys.begin ();
 
 	node += sizeof (BTreeNodeHeader);
 
 	while (it != keys.end ()) {
-		Clave *c = (*it);
-		memcpy (node, c->ToArray(), c->Size ());
-		node += c->Size ();
+		BTreeData d = (*it);
+		memcpy (node, d.ToArray(), d.Size ());
+		node += d.Size ();
 		it++;
 	}