-/* $Id: rsisams.c,v 1.11 2004-08-31 10:43:39 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 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);
{
"isams",
r_delete,
+ rset_get_one_term,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
};
-RSET rsisams_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- ISAMS is, ISAMS_P pos)
+RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+ ISAMS is, ISAMS_P pos, TERMID term)
{
- RSET rnew=rset_create_base(&control, nmem);
+ 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));
- assert(key_size); /* FIXME - these belong to the general rset */
- assert(cmp);
+ rnew->priv=info;
info->is=is;
info->pos=pos;
- rnew->priv=info;
return rnew;
}
static void r_delete (RSET ct)
{
- logf (LOG_DEBUG, "rsisams_delete");
+ yaz_log (YLOG_DEBUG, "rsisams_delete");
rset_delete(ct);
}
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;
}
rfd=rfd_create_base(ct);
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisams_rewind");
- abort ();
-}
-
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
- return isams_pp_read(ptinfo->pt, buf);
+ 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;
}
*current=-1; /* sorry, not implemented yet */
*total=-1;
}
+
+