Added extra presence check for tcl.h, because some systems have

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

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index 0de7cd5..f2697d5 100644 (file)
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamb.c,v 1.6 2004-06-01 12:32:19 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamb.c,v 1.10.2.3 2006-08-14 10:39:20 adam Exp $
+   Copyright (C) 1995-2005
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -15,13 +15,10 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 #include <stdio.h>
 #include <assert.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, int *current, int *total);
 static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -51,13 +51,32 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_forward, /* rset_default_forward, */
-    r_count,
+    rset_default_forward,
+    r_pos,
     r_read,
     r_write,
 };
 
+static const struct rset_control control_forward = 
+{
+    "isamb",
+    r_create,
+    r_open,
+    r_close,
+    r_delete,
+    r_rewind,
+    r_forward,
+    r_pos,
+    r_read,
+    r_write,
+};
+
+/* FIXME - using the default forward reads all items from the isam */
+/* and thus makes the term counts work OK. On the other hand, it   */
+/* negates the speedup from forwarding */
+
 const struct rset_control *rset_kind_isamb = &control;
+const struct rset_control *rset_kind_isamb_forward = &control_forward;
 
 struct rset_pp_info {
     ISAMB_PP pt;
@@ -156,20 +175,27 @@ 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, int *current, int *total)
 {
-    return 0;
+    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+    assert(rfd);
+    isamb_pp_pos(pinfo->pt, current, total);
 }
 
 static int r_read (RSFD rfd, void *buf, int *term_index)