X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/c162dfe2758a5908e7340d119af97bda75a91201..3b1230d10dade60af8e3eb544efb66cce69719b4:/emufs/b_plus_test.c

diff --git a/emufs/b_plus_test.c b/emufs/b_plus_test.c
index 3facd83..0dc7603 100644
--- a/emufs/b_plus_test.c
+++ b/emufs/b_plus_test.c
@@ -16,7 +16,6 @@ indice.filename = "idxbplus_primary.idx";
 printf("\nTam Nodo: %i  Size Claves: %i  Size_Hijos: %i\n",indice.tam_bloque,indice.size_claves,indice.size_hijos);
 emufs_b_plus_crear(&indice);
 	
-
 for (i=1;i<34;++i)
 {	
 querydata.num_bloque = i;
@@ -30,12 +29,22 @@ querydata.clave.i_clave = 7;
 b_plus_insertar(&indice,&querydata);
 
 querydata.num_bloque = 7;
+<<<<<<< .mine
+querydata.clave.i_clave = 5;
+b_plus_insertar_clave(&indice,&querydata);
+=======
 querydata.clave.i_clave = 5;
 b_plus_insertar(&indice,&querydata);
+>>>>>>> .r497
 
 querydata.num_bloque = 5;
+<<<<<<< .mine
+querydata.clave.i_clave = 3;
+b_plus_insertar_clave(&indice,&querydata);
+=======
 querydata.clave.i_clave = 3;
 b_plus_insertar(&indice,&querydata);
+>>>>>>> .r497
 
 querydata.num_bloque = 8;
 querydata.clave.i_clave = 63;