X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=2d732af6345a539c3dc8d6640c935a6b16c1ec01;hb=ac810b30806428926533d83bb0ec4ffab7aec598;hp=2f87328a61fc1d565d0fd0e548fefc97ca12a4c6;hpb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index 2f87328..2d732af 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamb.c,v 1.3 2004-01-16 15:27:35 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamb.c,v 1.8 2004-06-01 15:22:58 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.
@@ -20,32 +20,38 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+                     int (*cmpfunc)(const void *p1, const void *p2),
+                     const void *untilbuf);
 static int r_count (RSET ct);
 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_forward, /* rset_default_forward, */
     r_count,
     r_read,
     r_write,
@@ -146,6 +152,26 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
+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 int r_count (RSET ct)
 {
     return 0;