Added framework for the pos calls. rsisamb and rsnull have a real one,

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

diff --git a/rset/rsbool.c b/rset/rsbool.c
index ec03558..380ef6a 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.28 2004-06-02 12:31:23 adam Exp $
+/* $Id: rsbool.c,v 1.32 2004-08-03 14:54:41 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -40,7 +40,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_and (RSFD rfd, void *buf, int *term_index);
 static int r_read_or (RSFD rfd, void *buf, int *term_index);
 static int r_read_not (RSFD rfd, void *buf, int *term_index);
@@ -55,7 +55,7 @@ static const struct rset_control control_and =
     r_delete,
     r_rewind,
     r_forward, /* rset_default_forward, */
-    r_count,
+    rset_default_pos,
     r_read_and,
     r_write,
 };
@@ -73,7 +73,7 @@ static const struct rset_control control_or =
 #else
     rset_default_forward,
 #endif
-    r_count,
+    rset_default_pos,
     r_read_or,
     r_write,
 };
@@ -87,7 +87,7 @@ static const struct rset_control control_not =
     r_delete,
     r_rewind,
     r_forward, 
-    r_count,
+    rset_default_pos,
     r_read_not,
     r_write,
 };
@@ -227,7 +227,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 {
     struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    int cmp=0;
     int rc;
 
 #if RSET_DEBUG
@@ -256,37 +255,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
                        rfd, rc, p->more_l, p->more_r);
 #endif
     return rc;
-
-    if (p->more_l && p->more_r)
-           cmp = (*info->cmp)(p->buf_l, p->buf_r);
-       else if (p->more_l)
-           cmp = -2;
-       else
-           cmp = 2;
-    if ( (cmp<0) && (p->more_l) )
-    {
-        memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
-#if RSET_DEBUG
-        logf (LOG_DEBUG, "rsbool_forward returning L (cmp=%d)",cmp);
-#endif
-        return 1;
-    } else if ( (cmp>0) && (p->more_r) )
-    {
-        memcpy (buf, p->buf_r, info->key_size);
-           *term_index = p->term_index_r + info->term_index_s;
-#if RSET_DEBUG
-        logf (LOG_DEBUG, "rsbool_forward returning R (cmp=%d)",cmp);
-#endif
-        return 1;
-    }
-    /* return ( p->more_l || p->more_r); */
-    return 0;
-}
-
-static int r_count (RSET ct)
-{
-    return 0;
 }
 
 
@@ -399,7 +367,8 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
                 return 1;
-            } else
+            }
+           else
             {
 #if RSET_DEBUG
                 logf (LOG_DEBUG, "r_read_and [%p] about to forward R m=%d/%d c=%d",
@@ -557,15 +526,17 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index)
             return 1;
         }
         else if (cmp > 1)
+       {
 #if 0
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
                                   &p->term_index_r);
 #else
-            p->more_r = rset_forward( 
-                            info->rset_r, p->rfd_r, 
-                            p->buf_r, &p->term_index_r, 
-                            (info->cmp), p->buf_l);
+           p->more_r = rset_forward( 
+               info->rset_r, p->rfd_r, 
+               p->buf_r, &p->term_index_r, 
+               (info->cmp), p->buf_l);
 #endif
+       }
         else
         {
             memcpy (buf, p->buf_l, info->key_size);