Borrado de registros ya funciona entero dado que se arreglo el idx_borrar. Rutina...

[z.facultad/75.06/emufs.git] / emufs / tipo3_main.c

diff --git a/emufs/tipo3_main.c b/emufs/tipo3_main.c
index bdf5787031c08a528773878ce4e9aa4db82126c7..6123bcd18dbb4f63583de4152b0b1d85866011ae 100644 (file)
--- a/emufs/tipo3_main.c
+++ b/emufs/tipo3_main.c
@@ -1,11 +1,49 @@
+/* vim: set noexpandtab tabstop=4 shiftwidth=4:
+ *----------------------------------------------------------------------------
+ *                                  emufs
+ *----------------------------------------------------------------------------
+ * This file is part of emufs.
+ *
+ * emufs is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * emufs is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with emufs; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ *----------------------------------------------------------------------------
+ * Creado:  mié mar 31 17:26:46 ART 2004
+ * Autores: Nicolás Dimov <sagardua@uolsinectis.com.ar>
+ *----------------------------------------------------------------------------
+ *
+ * $Id$
+ *
+ */
+
+/** \file
+ *
+ * Prueba de archivo \ref tipo3.h "tipo3".
+ * 
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include "emufs.h"
+#include "idx.h"
+#include "fsc.h"
+
 
 int main(int argc, char *argv[])
 {
        EMUFS *fp;
-       int n1, n2, n3, n4, n5, n6, n7, n8;
+       EMUFS_REG_ID n1, n2, n3, n4, n5, n6, n7, n8;
+       EMUFS_REG_SIZE reg_size;
        char a[100];
        char b[100];
        char c[100];
@@ -15,6 +53,8 @@ int main(int argc, char *argv[])
        char g[100];
        char h[100];
        char i[100];
+       char* b_ptr;
+       int err = 0;
 
        if (argc != 2) {
                printf("Modo de uso : %s tam_bloque\n", argv[0]);
@@ -36,32 +76,38 @@ int main(int argc, char *argv[])
        strcpy(i, "me argrego despues de borrar a un registro");        
        
        fp = emufs_crear("articulos", T3, atoi(argv[1]), 100);
-       
-       n1 = fp->grabar_registro(fp, a, 100);
-       n2 = fp->grabar_registro(fp, c, 100);
-       n3 = fp->grabar_registro(fp, d, 100);
-       n4 = fp->grabar_registro(fp, e, 100);
-       n5 = fp->grabar_registro(fp, f, 100);
-       n6 = fp->grabar_registro(fp, g, 100);
-       n7 = fp->grabar_registro(fp, h, 100);
 
-       printf("ID0 = %d\n", n1);
-       printf("ID1 = %d\n", n2);
-       printf("ID2 = %d\n", n3);
-       printf("ID3 = %d\n", n4);
-       printf("ID4 = %d\n", n5);
-       printf("ID5 = %d\n", n6);
-       printf("ID6 = %d\n", n7);
+       n1 = fp->grabar_registro(fp, a, 100, &err);
+       n2 = fp->grabar_registro(fp, c, 100, &err);
+       n3 = fp->grabar_registro(fp, d, 100, &err);
+       n4 = fp->grabar_registro(fp, e, 100, &err);
+       n5 = fp->grabar_registro(fp, f, 100, &err);
+       n6 = fp->grabar_registro(fp, g, 100, &err);
+       n7 = fp->grabar_registro(fp, h, 100, &err);
+       n8 = fp->grabar_registro(fp, i, 100, &err);
 
+    ver_archivo_FS(fp);
+       
+       if ( fp->borrar_registro(fp, n1) == -1) printf("la cague %d\n",n1);
+       if ( fp->borrar_registro(fp, n2) == -1) printf("la cague %d\n",n2);
+       if ( fp->borrar_registro(fp, n3) == -1) printf("la cague %d\n",n3);
+       if ( fp->borrar_registro(fp, n4) == -1) printf("la cague %d\n",n4);
+       if ( fp->borrar_registro(fp, n5) == -1) printf("la cague %d\n",n5);
+/*     if ( fp->borrar_registro(fp, n6) == -1) printf("la cague %d\n",n6);     
+       if ( fp->borrar_registro(fp, n7) == -1) printf("la cague %d\n",n7);
+       if ( fp->borrar_registro(fp, n8) == -1) printf("la cague %d\n",n8);     
+       */
+       b_ptr = fp->leer_registro(fp, n7, &reg_size, &err);
+       
+       printf("Recuperado : %s\n", b_ptr);
 
-       fp->borrar_registro(fp, n4, 100);
-       n8 = fp->grabar_registro(fp, i, 100);
-       fp->leer_registro(fp, n8, b, 100);
-
-       printf("Recuperado : %s\n", b);
+       free(b_ptr);
 
        ver_archivo_FS(fp);
        
+       printf("la cantidad de registros eeeeesssss: %d\n", emufs_idx_get_count(fp));
+       printf("la cantidad de espacio libre es: %d\n", emufs_fsc_get_total_fs(fp));
+       
        emufs_destruir(fp);
        
        return 0;