X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=db767ba0aa9b175fc54fb8fd7fadc18de2323e19;hb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;hp=dce5eb25a29d6a54ce31f5d09f90e4a9a1acbd39;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index dce5eb2..db767ba 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,10 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: rsbool.c,v 1.17 2002-03-20 20:24:30 adam Exp $
- */
+/* $Id: rsbool.c,v 1.23 2004-01-16 15:27:35 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,6 +49,7 @@ static const struct rset_control control_and =
     r_close,
     r_delete,
     r_rewind,
+    rset_default_forward,
     r_count,
     r_read_and,
     r_write,
@@ -46,6 +63,7 @@ static const struct rset_control control_or =
     r_close,
     r_delete,
     r_rewind,
+    rset_default_forward,
     r_count,
     r_read_or,
     r_write,
@@ -59,6 +77,7 @@ static const struct rset_control control_not =
     r_close,
     r_delete,
     r_rewind,
+    rset_default_forward,
     r_count,
     r_read_not,
     r_write,
@@ -87,6 +106,7 @@ struct rset_bool_rfd {
     int term_index_r;
     void *buf_l;
     void *buf_r;
+    int tail;
     struct rset_bool_rfd *next;
     struct rset_bool_info *info;
 };    
@@ -142,6 +162,7 @@ static RSFD r_open (RSET ct, int flag)
 			     &rfd->term_index_l);
     rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r,
 			     &rfd->term_index_r);
+    rfd->tail = 0;
     return rfd;
 }
 
@@ -193,33 +214,52 @@ static int r_count (RSET ct)
     return 0;
 }
 
+
+/*
+    1,1         1,3
+    1,9         2,1
+    1,11        3,1
+    2,9
+
+  1,1     1,1
+  1,3     1,3
+          1,9
+          1,11
+  2,1     2,1
+          2,9
+          3,1
+*/
+
 static int r_read_and (RSFD rfd, void *buf, int *term_index)
 {
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
     struct rset_bool_info *info = p->info;
 
-    while (p->more_l && p->more_r)
+    while (p->more_l || p->more_r)
     {
         int cmp;
 
-        cmp = (*info->cmp)(p->buf_l, p->buf_r);
+        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)
         {
             memcpy (buf, p->buf_l, info->key_size);
 	    *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
 				   &p->term_index_l);
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
-            return 1;
+            p->tail = 1;
         }
         else if (cmp == 1)
         {
             memcpy (buf, p->buf_r, info->key_size);
-
 	    *term_index = p->term_index_r + info->term_index_s;
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
 				   &p->term_index_r);
+            p->tail = 1;
             return 1;
         }
         else if (cmp == -1)
@@ -228,14 +268,36 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
 	    *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
 				   &p->term_index_l);
+            p->tail = 1;
             return 1;
         }
         else if (cmp > 1)
+        {
+            memcpy (buf, p->buf_r, info->key_size);
+            *term_index = p->term_index_r + info->term_index_s;
+            
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+                                   &p->term_index_r);
+            if (p->tail)
+            {
+                if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1)
+                    p->tail = 0;
+                return 1;
+            }
+        }
         else
+        {
+            memcpy (buf, p->buf_l, info->key_size);
+	    *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
 				   &p->term_index_l);
+            if (p->tail)
+            {
+                if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1)
+                    p->tail = 0;
+                return 1;
+            }
+        }
     }
     return 0;
 }