Fix term counters to be of type zint. Fix several printfs of zint.

[idzebra-moved-to-github.git] / rset / rsisamb.c

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index c9579be..7965ece 100644 (file)
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamb.c,v 1.7 2004-06-01 14:51:00 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.
@@ -20,9 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
@@ -30,6 +27,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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);
@@ -39,7 +39,7 @@ 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 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);
 
@@ -52,7 +52,7 @@ static const struct rset_control control =
     r_delete,
     r_rewind,
     r_forward, /* rset_default_forward, */
-    r_count,
+    r_pos,
     r_read,
     r_write,
 };
@@ -63,7 +63,7 @@ struct rset_pp_info {
     ISAMB_PP pt;
     struct rset_pp_info *next;
     struct rset_isamb_info *info;
-    int *countp;
+    zint *countp;
     void *buf;
 };
 
@@ -156,21 +156,31 @@ 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; /*!*/
+    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)
+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)
@@ -178,6 +188,7 @@ 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)
     {