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
Fixed bug #165: Use multi-and and multi-or always. WS cleanups.
[idzebra-moved-to-github.git]
/
isams
/
isams.c
diff --git
a/isams/isams.c
b/isams/isams.c
index
7994294
..
aae9651
100644
(file)
--- a/
isams/isams.c
+++ b/
isams/isams.c
@@
-1,6
+1,6
@@
-/* $Id: isams.c,v 1.5 2004-06-01 12:56:39 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
- Index Data Aps
+/* $Id: isams.c,v 1.11 2005-01-15 19:38:31 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-27,7
+27,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <yaz/log.h>
#include <stdio.h>
#include <yaz/log.h>
-#include <isams.h>
+#include <yaz/xmalloc.h>
+#include <idzebra/isams.h>
typedef struct {
int last_offset;
typedef struct {
int last_offset;
@@
-59,9
+60,11
@@
struct ISAMS_PP_s {
void isams_getmethod (ISAMS_M *m)
{
void isams_getmethod (ISAMS_M *m)
{
- m->code_start = NULL;
- m->code_item = NULL;
- m->code_stop = NULL;
+ m->codec.start = NULL;
+ m->codec.decode = NULL;
+ m->codec.encode = NULL;
+ m->codec.stop = NULL;
+ m->codec.reset = NULL;
m->compare_item = NULL;
m->log_item = NULL;
m->compare_item = NULL;
m->log_item = NULL;
@@
-111,20
+114,20
@@
int isams_close (ISAMS is)
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
{
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
{
- char i_item[128], *i_item_ptr;
+ char i_item[128];
int i_more, i_mode;
void *r_clientData;
int first_block = is->head.last_block;
int first_offset = is->head.last_offset;
int count = 0;
int i_more, i_mode;
void *r_clientData;
int first_block = is->head.last_block;
int first_offset = is->head.last_offset;
int count = 0;
- r_clientData = (*is->method->code_start)(ISAMC_ENCODE);
+ r_clientData = (*is->method->codec.start)();
is->head.last_offset += sizeof(int);
if (is->head.last_offset > is->block_size)
{
if (is->debug > 2)
is->head.last_offset += sizeof(int);
if (is->head.last_offset > is->block_size)
{
if (is->debug > 2)
- logf (LOG_LOG, "first_block=%d", first_block);
+ yaz_log (YLOG_LOG, "first_block=%d", first_block);
bf_write(is->bf, is->head.last_block, 0, 0, is->merge_buf);
(is->head.last_block)++;
is->head.last_offset -= is->block_size;
bf_write(is->bf, is->head.last_block, 0, 0, is->merge_buf);
(is->head.last_block)++;
is->head.last_offset -= is->block_size;
@@
-133,8
+136,8
@@
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
}
while (1)
{
}
while (1)
{
- i_item_ptr = i_item;
- i_more = (*data->read_item)(data->clientData, &i_item_ptr, &i_mode);
+ char *tmp_ptr = i_item;
+ i_more = (*data->read_item)(data->clientData, &tmp_ptr, &i_mode);
assert (i_mode);
if (!i_more)
assert (i_mode);
if (!i_more)
@@
-143,9
+146,8
@@
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
{
char *r_out_ptr = is->merge_buf + is->head.last_offset;
{
char *r_out_ptr = is->merge_buf + is->head.last_offset;
- i_item_ptr = i_item;
- (*is->method->code_item)(ISAMC_ENCODE, r_clientData,
- &r_out_ptr, &i_item_ptr);
+ const char *i_item_ptr = i_item;
+ (*is->method->codec.encode)(r_clientData, &r_out_ptr, &i_item_ptr);
is->head.last_offset = r_out_ptr - is->merge_buf;
if (is->head.last_offset > is->block_size)
{
is->head.last_offset = r_out_ptr - is->merge_buf;
if (is->head.last_offset > is->block_size)
{
@@
-158,7
+160,7
@@
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
count++;
}
}
count++;
}
}
- (*is->method->code_stop)(ISAMC_ENCODE, r_clientData);
+ (*is->method->codec.stop)(r_clientData);
if (first_block == is->head.last_block)
memcpy(is->merge_buf + first_offset, &count, sizeof(int));
else if (first_block == is->head.last_block-1)
if (first_block == is->head.last_block)
memcpy(is->merge_buf + first_offset, &count, sizeof(int));
else if (first_block == is->head.last_block-1)
@@
-187,16
+189,16
@@
ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos)
ISAMS_PP pp = (ISAMS_PP) xmalloc (sizeof(*pp));
if (is->debug > 1)
ISAMS_PP pp = (ISAMS_PP) xmalloc (sizeof(*pp));
if (is->debug > 1)
- logf (LOG_LOG, "isams: isams_pp_open pos=%ld", (long) pos);
+ yaz_log (YLOG_LOG, "isams: isams_pp_open pos=%ld", (long) pos);
pp->is = is;
pp->is = is;
- pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE);
+ pp->decodeClientData = (*is->method->codec.start)();
pp->numKeys = 0;
pp->numRead = 0;
pp->buf = (char *) xmalloc(is->block_size*2);
pp->numKeys = 0;
pp->numRead = 0;
pp->buf = (char *) xmalloc(is->block_size*2);
- pp->block_no = pos/is->block_size;
- pp->block_offset = pos - pp->block_no * is->block_size;
+ pp->block_no = (int) (pos/is->block_size);
+ pp->block_offset = (int) (pos - pp->block_no * is->block_size);
if (is->debug)
if (is->debug)
- logf (LOG_LOG, "isams: isams_pp_open off=%d no=%d",
+ yaz_log (YLOG_LOG, "isams: isams_pp_open off=%d no=%d",
pp->block_offset, pp->block_no);
if (pos)
{
pp->block_offset, pp->block_no);
if (pos)
{
@@
-204,7
+206,7
@@
ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos)
bf_read (is->bf, pp->block_no+1, 0, 0, pp->buf + is->block_size);
memcpy(&pp->numKeys, pp->buf + pp->block_offset, sizeof(int));
if (is->debug)
bf_read (is->bf, pp->block_no+1, 0, 0, pp->buf + is->block_size);
memcpy(&pp->numKeys, pp->buf + pp->block_offset, sizeof(int));
if (is->debug)
- logf (LOG_LOG, "isams: isams_pp_open numKeys=%d", pp->numKeys);
+ yaz_log (YLOG_LOG, "isams: isams_pp_open numKeys=%d", pp->numKeys);
pp->block_offset += sizeof(int);
}
return pp;
pp->block_offset += sizeof(int);
}
return pp;
@@
-212,7
+214,7
@@
ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos)
void isams_pp_close (ISAMS_PP pp)
{
void isams_pp_close (ISAMS_PP pp)
{
- (*pp->is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData);
+ (*pp->is->method->codec.stop)(pp->decodeClientData);
xfree(pp->buf);
xfree(pp);
}
xfree(pp->buf);
xfree(pp);
}
@@
-224,12
+226,13
@@
int isams_pp_num (ISAMS_PP pp)
int isams_pp_read (ISAMS_PP pp, void *buf)
{
int isams_pp_read (ISAMS_PP pp, void *buf)
{
- return isams_read_item (pp, (char **) &buf);
+ char *cp = buf;
+ return isams_read_item (pp, &cp);
}
int isams_read_item (ISAMS_PP pp, char **dst)
{
}
int isams_read_item (ISAMS_PP pp, char **dst)
{
- char *src;
+ const char *src;
if (pp->numRead >= pp->numKeys)
return 0;
(pp->numRead)++;
if (pp->numRead >= pp->numKeys)
return 0;
(pp->numRead)++;
@@
-242,8
+245,7
@@
int isams_read_item (ISAMS_PP pp, char **dst)
pp->buf + pp->is->block_size);
}
src = pp->buf + pp->block_offset;
pp->buf + pp->is->block_size);
}
src = pp->buf + pp->block_offset;
- (*pp->is->method->code_item)(ISAMC_DECODE, pp->decodeClientData,
- dst, &src);
+ (*pp->is->method->codec.decode)(pp->decodeClientData, dst, &src);
pp->block_offset = src - pp->buf;
return 1;
}
pp->block_offset = src - pp->buf;
return 1;
}