projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only add first in field marker if there field has term(s) in it
[idzebra-moved-to-github.git]
/
isamb
/
isamb.c
diff --git
a/isamb/isamb.c
b/isamb/isamb.c
index
bb51393
..
0578ff7
100644
(file)
--- a/
isamb/isamb.c
+++ b/
isamb/isamb.c
@@
-1,4
+1,4
@@
-/* $Id: isamb.c,v 1.83 2006-08-14 10:40:17 adam Exp $
+/* $Id: isamb.c,v 1.86 2006-11-14 12:03:48 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
Copyright (C) 1995-2006
Index Data ApS
@@
-157,14
+157,13
@@
static void encode_ptr(char **dst, zint pos)
#define decode_item_len decode_ptr
#if ISAMB_PTR_CODEC
#define decode_item_len decode_ptr
#if ISAMB_PTR_CODEC
-static void decode_ptr(const char **src1, zint *pos)
+static void decode_ptr(const char **src, zint *pos)
{
{
- const unsigned char **src = (const unsigned char **) src1;
zint d = 0;
unsigned char c;
unsigned r = 0;
zint d = 0;
unsigned char c;
unsigned r = 0;
- while (((c = *(*src)++) & 128))
+ while (((c = *(const unsigned char *)((*src)++)) & 128))
{
d += ((zint) (c & 127) << r);
r += 7;
{
d += ((zint) (c & 127) << r);
r += 7;
@@
-200,12
+199,19
@@
ISAMB isamb_open(BFiles bfs, const char *name, int writeflag, ISAMC_M *method,
assert(cache == 0);
isamb->file = xmalloc(sizeof(*isamb->file) * isamb->no_cat);
assert(cache == 0);
isamb->file = xmalloc(sizeof(*isamb->file) * isamb->no_cat);
+
+ for (i = 0; i < isamb->no_cat; i++)
+ {
+ isamb->file[i].bf = 0;
+ isamb->file[i].head_dirty = 0;
+ isamb->file[i].cache_entries = 0;
+ }
+
for (i = 0; i < isamb->no_cat; i++)
{
char fname[DST_BUF_SIZE];
char hbuf[DST_BUF_SIZE];
for (i = 0; i < isamb->no_cat; i++)
{
char fname[DST_BUF_SIZE];
char hbuf[DST_BUF_SIZE];
- isamb->file[i].cache_entries = 0;
- isamb->file[i].head_dirty = 0;
+
sprintf(fname, "%s%c", name, i+'A');
if (cache)
isamb->file[i].bf = bf_open(bfs, fname, ISAMB_CACHE_ENTRY_SIZE,
sprintf(fname, "%s%c", name, i+'A');
if (cache)
isamb->file[i].bf = bf_open(bfs, fname, ISAMB_CACHE_ENTRY_SIZE,
@@
-213,6
+219,12
@@
ISAMB isamb_open(BFiles bfs, const char *name, int writeflag, ISAMC_M *method,
else
isamb->file[i].bf = bf_open(bfs, fname, b_size, writeflag);
else
isamb->file[i].bf = bf_open(bfs, fname, b_size, writeflag);
+ if (!isamb->file[i].bf)
+ {
+ isamb_close(isamb);
+ return 0;
+ }
+
/* fill-in default values (for empty isamb) */
isamb->file[i].head.first_block = ISAMB_CACHE_ENTRY_SIZE/b_size+1;
isamb->file[i].head.last_block = isamb->file[i].head.first_block;
/* fill-in default values (for empty isamb) */
isamb->file[i].head.first_block = ISAMB_CACHE_ENTRY_SIZE/b_size+1;
isamb->file[i].head.last_block = isamb->file[i].head.first_block;
@@
-415,7
+427,8
@@
void isamb_close (ISAMB isamb)
bf_write(isamb->file[i].bf, pos, 0, 0, hbuf + pos*b_size);
}
}
bf_write(isamb->file[i].bf, pos, 0, 0, hbuf + pos*b_size);
}
}
- bf_close (isamb->file[i].bf);
+ if (isamb->file[i].bf)
+ bf_close (isamb->file[i].bf);
}
xfree(isamb->file);
xfree(isamb->method);
}
xfree(isamb->file);
xfree(isamb->method);
@@
-449,11
+462,11
@@
static struct ISAMB_block *open_block(ISAMB b, ISAM_P pos)
if (!cache_block (b, pos, p->buf, 0))
{
yaz_log(b->log_io, "bf_read: open_block");
if (!cache_block (b, pos, p->buf, 0))
{
yaz_log(b->log_io, "bf_read: open_block");
- if (!bf_read(b->file[cat].bf, pos/CAT_MAX, 0, 0, p->buf))
+ if (bf_read(b->file[cat].bf, pos/CAT_MAX, 0, 0, p->buf) != 1)
{
yaz_log(YLOG_FATAL, "isamb: read fail for pos=%ld block=%ld",
(long) pos, (long) pos/CAT_MAX);
{
yaz_log(YLOG_FATAL, "isamb: read fail for pos=%ld block=%ld",
(long) pos, (long) pos/CAT_MAX);
- abort();
+ zebra_exit("isamb:open_block");
}
}
p->bytes = (char *)p->buf + offset;
}
}
p->bytes = (char *)p->buf + offset;
@@
-499,7
+512,7
@@
struct ISAMB_block *new_block (ISAMB b, int leaf, int cat)
{
yaz_log(YLOG_FATAL, "isamb: read fail for pos=%ld block=%ld",
(long) p->pos/CAT_MAX, (long) p->pos/CAT_MAX);
{
yaz_log(YLOG_FATAL, "isamb: read fail for pos=%ld block=%ld",
(long) p->pos/CAT_MAX, (long) p->pos/CAT_MAX);
- abort ();
+ zebra_exit("isamb:new_block");
}
}
yaz_log(b->log_freelist, "got block " ZINT_FORMAT " from freelist %d:" ZINT_FORMAT, p->pos,
}
}
yaz_log(b->log_freelist, "got block " ZINT_FORMAT " from freelist %d:" ZINT_FORMAT, p->pos,
@@
-876,7
+889,7
@@
int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
if (!*lookahead_mode)
{
yaz_log(YLOG_WARN, "isamb: Inconsistent register (1)");
if (!*lookahead_mode)
{
yaz_log(YLOG_WARN, "isamb: Inconsistent register (1)");
- assert (*lookahead_mode);
+ assert(*lookahead_mode);
}
}
else
}
}
else
@@
-994,7
+1007,7
@@
int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
{
/* this is append. So a delete is bad */
yaz_log(YLOG_WARN, "isamb: Inconsistent register (2)");
{
/* this is append. So a delete is bad */
yaz_log(YLOG_WARN, "isamb: Inconsistent register (2)");
- abort();
+ assert(*lookahead_mode);
}
else if (!half1 && dst > tail_cut)
{
}
else if (!half1 && dst > tail_cut)
{