/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 1994-2011 Index Data
Zebra 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
*/
-/*
+/*
* TODO:
* Reduction to lower categories in isamc_merge
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <assert.h>
#include <string.h>
{
if (is->method->debug)
yaz_log (YLOG_LOG, "isc:%6d %6d %6d %6d",
- filecat[i].bsize, filecat[i].ifill,
+ filecat[i].bsize, filecat[i].ifill,
filecat[i].mfill, filecat[i].mblocks);
if (max_buf_size < filecat[i].mblocks * filecat[i].bsize)
max_buf_size = filecat[i].mblocks * filecat[i].bsize;
max_buf_size = (1+is->method->max_blocks_mem) * filecat[i].bsize;
if (is->method->debug)
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);
if (writeflag)
{
memcpy (abuf + sizeof(int), &block, sizeof(zint));
is->files[cat].head.freelist = pos;
- is->files[cat].head_is_dirty = 1;
+ is->files[cat].head_is_dirty = 1;
}
else
{
static void release_block (ISAMC is, int cat, zint pos)
{
char buf[sizeof(zint)];
-
+
(is->files[cat].no_released)++;
- is->files[cat].head_is_dirty = 1;
+ is->files[cat].head_is_dirty = 1;
memcpy (buf, &is->files[cat].head.freelist, sizeof(zint));
is->files[cat].head.freelist = pos;
bf_write (is->files[cat].bf, pos, 0, sizeof(zint), buf);
static void init_fc (ISAMC is, int cat)
{
int j = 100;
-
+
is->files[cat].fc_max = j;
is->files[cat].fc_list = (zint *)
xmalloc (sizeof(*is->files[0].fc_list) * j);
{
ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
char *src;
-
+
pp->cat = (int) isamc_type(ipos);
- pp->pos = isamc_block(ipos);
+ pp->pos = isamc_block(ipos);
src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
assert (pp->next != pp->pos);
}
- pp->offset = src - pp->buf;
+ pp->offset = src - pp->buf;
assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
if (is->method->debug > 2)
yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
if (pp->deleteFlag)
isamc_release_block (is, pp->cat, pp->pos);
(*is->method->codec.decode)(pp->decodeClientData, dst, &src);
- pp->offset = src - pp->buf;
+ pp->offset = src - pp->buf;
if (is->method->debug > 2)
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;
}
(*is->method->codec.decode)(pp->decodeClientData, dst, &src);
- pp->offset = src - pp->buf;
+ pp->offset = src - pp->buf;
return 1;
}