X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fisamc.c;h=534037f90ce4247c64b717cb0ac920ee957626b7;hb=0e56fa84bb4a5985c19a21926e86862c08d84689;hp=d15ba1eba986230a85e98e13f9f8942ccd616f73;hpb=1bb217ab477284fd7fee47f19a6e8a780fa2bb50;p=idzebra-moved-to-github.git diff --git a/isamc/isamc.c b/isamc/isamc.c index d15ba1e..534037f 100644 --- a/isamc/isamc.c +++ b/isamc/isamc.c @@ -1,4 +1,4 @@ -/* $Id: isamc.c,v 1.26 2004-08-06 12:28:23 adam Exp $ +/* $Id: isamc.c,v 1.27 2004-11-19 10:27:09 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -29,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include +#include #include "isamc-p.h" static void flush_block (ISAMC is, int cat); @@ -88,11 +88,11 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) /* determine number of block categories */ if (is->method->debug) - logf (LOG_LOG, "isc: bsize ifill mfill mblocks"); + yaz_log (YLOG_LOG, "isc: bsize ifill mfill mblocks"); do { if (is->method->debug) - logf (LOG_LOG, "isc:%6d %6d %6d %6d", + yaz_log (YLOG_LOG, "isc:%6d %6d %6d %6d", filecat[i].bsize, filecat[i].ifill, filecat[i].mfill, filecat[i].mblocks); if (max_buf_size < filecat[i].mblocks * filecat[i].bsize) @@ -105,7 +105,7 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) if (max_buf_size < (1+is->method->max_blocks_mem) * filecat[i].bsize) max_buf_size = (1+is->method->max_blocks_mem) * filecat[i].bsize; if (is->method->debug) - logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size); + yaz_log (YLOG_LOG, "isc: max_buf_size %d", max_buf_size); assert (is->no_files > 0); is->files = (ISAMC_file) xmalloc (sizeof(*is->files)*is->no_files); @@ -174,9 +174,9 @@ int isc_close (ISAMC is) if (is->method->debug) { - logf (LOG_LOG, "isc: next forw mid-f prev backw mid-b"); + yaz_log (YLOG_LOG, "isc: next forw mid-f prev backw mid-b"); for (i = 0; ino_files; i++) - logf (LOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f", + yaz_log (YLOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f", is->files[i].no_next, is->files[i].no_forward, is->files[i].no_forward ? @@ -189,7 +189,7 @@ int isc_close (ISAMC is) : 0.0); } if (is->method->debug) - logf (LOG_LOG, "isc: writes reads skipped alloc released remap"); + yaz_log (YLOG_LOG, "isc: writes reads skipped alloc released remap"); for (i = 0; ino_files; i++) { release_fc (is, i); @@ -198,7 +198,7 @@ int isc_close (ISAMC is) bf_write (is->files[i].bf, 0, 0, sizeof(ISAMC_head), &is->files[i].head); if (is->method->debug) - logf (LOG_LOG, "isc:%8d%8d%8d%8d%8d%8d", + yaz_log (YLOG_LOG, "isc:%8d%8d%8d%8d%8d%8d", is->files[i].no_writes, is->files[i].no_reads, is->files[i].no_skip_writes, @@ -226,7 +226,7 @@ int isc_write_block (ISAMC is, int cat, zint pos, char *src) { ++(is->files[cat].no_writes); if (is->method->debug > 2) - logf (LOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos); + yaz_log (YLOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos); return bf_write (is->files[cat].bf, pos, 0, 0, src); } @@ -235,7 +235,7 @@ int isc_write_dblock (ISAMC is, int cat, zint pos, char *src, { ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N; if (is->method->debug > 2) - logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT, + yaz_log (YLOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT, (int) size, nextpos); src -= ISAMC_BLOCK_OFFSET_N; memcpy (src, &nextpos, sizeof(nextpos)); @@ -394,14 +394,14 @@ zint isc_alloc_block (ISAMC is, int cat) if (!block) block = alloc_block (is, cat); if (is->method->debug > 3) - logf (LOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block); + yaz_log (YLOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block); return block; } void isc_release_block (ISAMC is, int cat, zint pos) { if (is->method->debug > 3) - logf (LOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos); + yaz_log (YLOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos); if (is->files[cat].fc_list) { int j; @@ -478,14 +478,14 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) src += sizeof(pp->numKeys); if (pp->next == pp->pos) { - yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); - yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); assert (pp->next != pp->pos); } pp->offset = src - pp->buf; assert (pp->offset == ISAMC_BLOCK_OFFSET_1); if (is->method->debug > 2) - logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" + yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next); } return pp; @@ -549,8 +549,8 @@ int isc_read_item (ISAMC_PP pp, char **dst) if (pp->next == pp->pos) { - yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); - yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); assert (pp->next != pp->pos); } @@ -559,7 +559,7 @@ int isc_read_item (ISAMC_PP pp, char **dst) (*is->method->codec.decode)(pp->decodeClientData, dst, &src); pp->offset = src - pp->buf; if (is->method->debug > 2) - logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" + yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next); return 2; }