-/* $Id: rsisamb.c,v 1.20 2004-08-31 14:43:42 heikki Exp $
+/* $Id: rsisamb.c,v 1.25 2004-10-22 10:12:52 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
-#include <rsisamb.h>
+#include <rset.h>
#include <string.h>
-#include <../index/index.h> /* for log_keydump. Debugging only */
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
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_forward(RSFD rfd, void *buf,
- int (*cmpfunc)(const void *p1, const void *p2),
- const void *untilbuf);
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf);
static void r_pos (RSFD rfd, double *current, double *total);
-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 const struct rset_control control =
{
"isamb",
r_delete,
+ rset_get_one_term,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read,
struct rset_isamb_info {
ISAMB is;
ISAMB_P pos;
- int key_size;
- int (*cmp)(const void *p1, const void *p2);
};
-RSET rsisamb_create( NMEM nmem, int key_size,
- int (*cmp)(const void *p1, const void *p2),
- ISAMB is, ISAMB_P pos)
+RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+ ISAMB is, ISAMB_P pos, TERMID term)
{
- RSET rnew=rset_create_base(&control, nmem);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
struct rset_isamb_info *info;
info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- info->key_size = key_size;
- info->cmp = cmp;
info->is=is;
info->pos=pos;
rnew->priv=info;
if (rfd->priv)
ptinfo=(struct rset_pp_info *) (rfd->priv);
else {
- ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
- ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
+ ptinfo = (struct rset_pp_info *)nmem_malloc(ct->nmem,sizeof(*ptinfo));
+ ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
rfd->priv=ptinfo;
}
- ptinfo->pt = isamb_pp_open (info->is, info->pos);
+ ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope );
return rfd;
}
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisamb_rewind");
- abort ();
-}
-
-static int r_forward(RSFD rfd, void *buf,
- int (*cmpfunc)(const void *p1, const void *p2),
- const void *untilbuf)
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
{
struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
- return isamb_pp_forward(pinfo->pt, buf, untilbuf);
+ int rc;
+ rc=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+ if (rc && term)
+ *term=rfd->rset->term;
+ return rc;
}
static void r_pos (RSFD rfd, double *current, double *total)
#endif
}
-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->priv);
-
- return isamb_pp_read(pinfo->pt, buf);
+ int rc;
+ rc=isamb_pp_read(pinfo->pt, buf);
+ if (rc && term)
+ *term=rfd->rset->term;
+ return rc;
}
static int r_write (RSFD rfd, const void *buf)