-/* $Id: rsisams.c,v 1.9 2004-08-23 12:38:53 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsisams.c,v 1.18 2005-01-15 19:38:34 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
-#include <rsisams.h>
+#include <rset.h>
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
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 =
{
"isams",
- r_create,
+ 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 {
ISAMS_PP pt;
- struct rset_pp_info *next;
- struct rset_isams_info *info;
};
struct rset_isams_info {
ISAMS is;
ISAMS_P pos;
- struct rset_pp_info *ispt_list;
};
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
+
+RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+ ISAMS is, ISAMS_P pos, TERMID term)
{
- rset_isams_parms *pt = (struct rset_isams_parms *) parms;
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
struct rset_isams_info *info;
+ info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ rnew->priv=info;
+ info->is=is;
+ info->pos=pos;
+ return rnew;
+}
- info = (struct rset_isams_info *) xmalloc (sizeof(*info));
- info->is = pt->is;
- info->pos = pt->pos;
- info->ispt_list = NULL;
- return info;
+static void r_delete (RSET ct)
+{
+ yaz_log (YLOG_DEBUG, "rsisams_delete");
+ rset_delete(ct);
}
+
RSFD r_open (RSET ct, int flag)
{
- struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
+ struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+ RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (LOG_DEBUG, "risams_open");
+ yaz_log (YLOG_DEBUG, "risams_open");
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMS set type is read-only");
+ yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
return NULL;
}
- ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
- ptinfo->next = info->ispt_list;
- info->ispt_list = ptinfo;
- ptinfo->pt = isams_pp_open (info->is, info->pos);
- ptinfo->info = info;
- return ptinfo;
+ 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));
+ ptinfo->pt = isams_pp_open (info->is, info->pos);
+ rfd->priv=ptinfo;
+ }
+ return rfd;
}
static void r_close (RSFD rfd)
{
- struct rset_isams_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)
- {
- isams_pp_close ((*ptinfop)->pt);
- *ptinfop = (*ptinfop)->next;
- xfree (rfd);
- return;
- }
- logf (LOG_FATAL, "r_close but no rfd match!");
- assert (0);
-}
-
-static void r_delete (RSET ct)
-{
- struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
-
- logf (LOG_DEBUG, "rsisams_delete");
- assert (info->ispt_list == NULL);
- xfree (info);
-}
+ struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisams_rewind");
- abort ();
+ isams_pp_close (ptinfo->pt);
+ rfd_delete_base(rfd);
}
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
+ struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+ int rc;
+ rc=isams_pp_read(ptinfo->pt, buf);
+ if (rc && term)
+ *term=rfd->rset->term;
+ return rc;
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "ISAMS set type is read-only");
+ yaz_log (YLOG_FATAL, "ISAMS 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;
+}
+
+