* Se agregan compactar facturas y notas (notas no estoy seguro de tener

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

diff --git a/emufs/idx.c b/emufs/idx.c
index e23a77f759289fcf3049dd1e538039ae4596cad5..f9c33db6f431d393dff907088fdbb97537720eea 100644 (file)
--- a/emufs/idx.c
+++ b/emufs/idx.c
@@ -131,7 +131,6 @@ EMUFS_BLOCK_ID emufs_idx_buscar_registro(EMUFS *emu, EMUFS_REG_ID reg_id)
        return EMUFS_NOT_FOUND;
 }
 
        return EMUFS_NOT_FOUND;
 }
 

-/* agrega un registro al final del archivo */

 int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
 {
        FILE *f_idx;
 int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
 {
        FILE *f_idx;


@@ -141,7 +140,7 @@ int emufs_idx_agregar(EMUFS *emu, EMUFS_REG_ID id_reg, EMUFS_BLOCK_ID location)
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 
        strcpy(name_f_idx,emu->nombre);
        strcat(name_f_idx, EMUFS_IDX_EXT);
 

-       if ( (f_idx = fopen(name_f_idx,"a+b"))==NULL ) return -1;
+       if ( (f_idx = fopen(name_f_idx,"r+"))==NULL ) return -1;

 
        fseek(f_idx, sizeof(EMUFS_IDX)*id_reg, SEEK_SET); 
        reg.id_reg = id_reg;
 
        fseek(f_idx, sizeof(EMUFS_IDX)*id_reg, SEEK_SET); 
        reg.id_reg = id_reg;


@@ -217,7 +216,7 @@ EMUFS_REG_ID *emufs_idx_get(EMUFS *emu, EMUFS_REG_ID *cant)
                if (fread(&reg, sizeof(EMUFS_IDX), 1, f_idx) != 1) continue;
                count++;
                /* TODO : Verificar errores :-D */
                if (fread(&reg, sizeof(EMUFS_IDX), 1, f_idx) != 1) continue;
                count++;
                /* TODO : Verificar errores :-D */

-               tmp = realloc(tmp, count);
+               tmp = realloc(tmp, count*sizeof(EMUFS_REG_ID));

                tmp[count-1] = reg.id_reg;
        }
        fclose(f_idx);
                tmp[count-1] = reg.id_reg;
        }
        fclose(f_idx);


@@ -226,6 +225,10 @@ EMUFS_REG_ID *emufs_idx_get(EMUFS *emu, EMUFS_REG_ID *cant)
        return tmp;
 }
 
        return tmp;
 }
 

+/** @todo FIXME borrar cuando se cambie emufs_gui/registros.c que es el unico
+ * que lo usa.
+ * @deprecated Usar emufs_idx_buscar_registro.
+ */

 int emufs_idx_existe_id(EMUFS *emu, int ID)
 {
        FILE *f_idx;
 int emufs_idx_existe_id(EMUFS *emu, int ID)
 {
        FILE *f_idx;


@@ -242,13 +245,13 @@ int emufs_idx_existe_id(EMUFS *emu, int ID)
        
        if (fseek(f_idx, sizeof(EMUFS_IDX)*ID, SEEK_SET) == 0) {
                fread(&reg, sizeof(EMUFS_IDX), 1, f_idx);
        
        if (fseek(f_idx, sizeof(EMUFS_IDX)*ID, SEEK_SET) == 0) {
                fread(&reg, sizeof(EMUFS_IDX), 1, f_idx);

-               if (reg.location == EMUFS_NOT_FOUND) {
+               if (reg.location != EMUFS_NOT_FOUND) {

                        fclose(f_idx);
                        fclose(f_idx);

-                       return -1;
+                       return 0;

                }
        }
        fclose(f_idx);
                }
        }
        fclose(f_idx);

-       return 0;/*no existe el id*/
+       return -1;/*no existe el id*/

 }
 
 int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
 }
 
 int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)


@@ -264,8 +267,7 @@ int emufs_idx_actualizar(EMUFS *emu, int ID, EMUFS_BLOCK_ID bloque)
                PERR("No se pudo abrir el archivo");
                return -1;
        }
                PERR("No se pudo abrir el archivo");
                return -1;
        }

-       printf("actualice el id = %d\n",ID);
-       /*fseek(f_idx,0,SEEK_SET);*/
+       fseek(f_idx,0,SEEK_SET);

        fseek(f_idx,ID*sizeof(EMUFS_IDX),SEEK_SET);
        fread(&reg,sizeof(EMUFS_IDX),1,f_idx);
        reg.location = bloque;
        fseek(f_idx,ID*sizeof(EMUFS_IDX),SEEK_SET);
        fread(&reg,sizeof(EMUFS_IDX),1,f_idx);
        reg.location = bloque;