-/* $Id: rsisamb.c,v 1.4 2004-01-28 10:44:52 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamb.c,v 1.14 2004-08-06 12:55:03 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
02111-1307, USA.
*/
-
-
-
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
#include <rsisamb.h>
#include <string.h>
+#include <../index/index.h> /* for log_keydump. Debugging only */
+
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
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_count (RSET ct);
+static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+ int (*cmpfunc)(const void *p1, const void *p2),
+ const void *untilbuf);
+static void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
- "isamc",
+ "isamb",
r_create,
r_open,
r_close,
r_delete,
r_rewind,
- rset_default_forward,
- r_count,
+ r_forward, /* rset_default_forward, */
+ r_pos,
r_read,
r_write,
};
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
abort ();
}
-static int r_count (RSET ct)
+static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+ int (*cmpfunc)(const void *p1, const void *p2),
+ const void *untilbuf)
+{
+ int i;
+ struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+#if RSET_DEBUG
+ logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)",
+ ct->control->desc, ct,rfd);
+ key_logdump(LOG_DEBUG, untilbuf);
+ key_logdump(LOG_DEBUG, buf);
+#endif
+
+ i=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+#if RSET_DEBUG
+ logf (LOG_DEBUG, "rset_rsisamb_forward returning %d",i);
+#endif
+ return i;
+}
+
+static void r_pos (RSFD rfd, double *current, double *total)
{
- return 0;
+ struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+ assert(rfd);
+ isamb_pp_pos(pinfo->pt, current, total);
+#if RSET_DEBUG
+ logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+ *current, *total);
+#endif
}
static int r_read (RSFD rfd, void *buf, int *term_index)
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
*term_index = 0;
+
r = isamb_pp_read(pinfo->pt, buf);
if (r > 0)
{