-/* $Id: rsisamc.c,v 1.21 2004-08-24 14:25:16 heikki Exp $
+/* $Id: rsisamc.c,v 1.32 2004-11-15 23:13:12 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <assert.h>
#include <string.h>
#include <zebrautl.h>
-#include <rsisamc.h>
+#include <rset.h>
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
-static void r_rewind (RSFD rfd);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
static int r_write (RSFD rfd, const void *buf);
+static void r_pos (RSFD rfd, double *current, double *total);
static const struct rset_control control =
{
"isamc",
+ r_delete,
+ rset_get_one_term,
r_open,
r_close,
- r_delete,
- r_rewind,
rset_default_forward,
- rset_default_pos,
+ r_pos,
r_read,
r_write,
};
struct rset_pp_info {
ISAMC_PP pt;
- struct rset_pp_info *next;
- struct rset_isamc_info *info;
void *buf;
};
struct rset_isamc_info {
ISAMC is;
ISAMC_P pos;
- int key_size;
- int (*cmp)(const void *p1, const void *p2);
- struct rset_pp_info *ispt_list;
};
-RSET rsisamc_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- ISAMC is, ISAMC_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 rnew=rset_create_base(&control, nmem);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
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->key_size = key_size;
- info->cmp = cmp;
- info->ispt_list = NULL;
- info->is=is;
- info->pos=pos;
- rnew->priv=info;
+ info->is = is;
+ info->pos = pos;
+ rnew->priv = info;
+ yaz_log(log_level, "create: term=%p", term);
return rnew;
}
static void r_delete (RSET ct)
{
- struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
-
- logf (LOG_DEBUG, "rsisamc_delete");
- assert (info->ispt_list == NULL);
+ yaz_log(log_level, "rsisamc_delete");
}
-/*
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
-{
- rset_isamc_parms *pt = (rset_isamc_parms *) parms;
- struct rset_isamc_info *info;
-
- info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
- info->is = pt->is;
- info->pos = pt->pos;
- info->key_size = pt->key_size;
- info->cmp = pt->cmp;
- info->ispt_list = NULL;
- return info;
-}
-*/
RSFD r_open (RSET ct, int flag)
{
struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
+ RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (LOG_DEBUG, "risamc_open");
+ yaz_log(log_level, "risamc_open");
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMC set type is read-only");
- return NULL;
+ yaz_log(LOG_FATAL, "ISAMC set type is read-only");
+ return NULL;
+ }
+ rfd = rfd_create_base(ct);
+ if (rfd->priv)
+ ptinfo = (struct rset_pp_info *)rfd->priv;
+ else {
+ ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
+ rfd->priv = ptinfo;
+ ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
}
- ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
- ptinfo->next = info->ispt_list;
- info->ispt_list = ptinfo;
- ptinfo->pt = isc_pp_open (info->is, info->pos);
- ptinfo->info = info;
- ptinfo->buf = xmalloc (info->key_size);
- return ptinfo;
+ ptinfo->pt = isc_pp_open(info->is, info->pos);
+ return rfd;
}
static void r_close (RSFD rfd)
{
- struct rset_isamc_info *info = ((struct rset_pp_info*) rfd)->info;
- struct rset_pp_info **ptinfop;
-
- for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
- if (*ptinfop == rfd)
- {
- xfree ((*ptinfop)->buf);
- isc_pp_close ((*ptinfop)->pt);
- *ptinfop = (*ptinfop)->next;
- xfree (rfd);
- return;
- }
- logf (LOG_FATAL, "r_close but no rfd match!");
- assert (0);
-}
+ struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
-
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisamc_rewind");
- abort ();
+ isc_pp_close(p->pt);
+ rfd_delete_base(rfd);
}
-static int r_read (RSFD rfd, void *buf)
+
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+ struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
int r;
- r = isc_pp_read(pinfo->pt, buf);
+ r = isc_pp_read(p->pt, buf);
+ if (term)
+ *term = rfd->rset->term;
+ yaz_log(log_level,"read returning term %p", *term);
return r;
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "ISAMC set type is read-only");
+ yaz_log(LOG_FATAL, "ISAMC set type is read-only");
return -1;
}
+
+static void r_pos (RSFD rfd, double *current, double *total)
+{
+ *current = -1; /* sorry, not implemented yet */
+ *total = -1;
+}
+
+
+