-/* $Id: rsisamc.c,v 1.34 2005-01-11 14:03:04 adam Exp $
+/* $Id: rsisamc.c,v 1.40 2005-05-24 11:35:43 adam Exp $
Copyright (C) 1995-2005
- Index Data Aps
+ Index Data ApS
This file is part of the Zebra server.
02111-1307, USA.
*/
-
-
-
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
static RSFD r_open (RSET ct, int flag);
rset_get_one_term,
r_open,
r_close,
- rset_default_forward,
+ 0, /* no forward */
r_pos,
r_read,
r_write,
};
-const struct rset_control *rset_kind_isamc = &control;
-
struct rset_pp_info {
ISAMC_PP pt;
void *buf;
struct rset_isamc_info {
ISAMC is;
- ISAMC_P pos;
+ ISAM_P pos;
};
static int log_level = 0;
static int log_level_initialized = 0;
-RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
- ISAMC is, ISAMC_P pos, TERMID term)
+RSET rsisamc_create(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope,
+ ISAMC is, ISAM_P pos, TERMID term)
{
- RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
struct rset_isamc_info *info;
if (!log_level_initialized)
{
log_level = yaz_log_module_level("rsisamc");
log_level_initialized = 1;
}
- info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem, sizeof(*info));
info->is = is;
info->pos = pos;
rnew->priv = info;
rfd->priv = ptinfo;
ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
}
- ptinfo->pt = isc_pp_open(info->is, info->pos);
+ ptinfo->pt = isamc_pp_open(info->is, info->pos);
return rfd;
}
{
struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
- isc_pp_close(p->pt);
- rfd_delete_base(rfd);
+ isamc_pp_close(p->pt);
}
{
struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
int r;
- r = isc_pp_read(p->pt, buf);
+ r = isamc_pp_read(p->pt, buf);
if (term)
*term = rfd->rset->term;
yaz_log(log_level, "isamc.r_read");