X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=rset%2Frsprox.c;h=60f80abf97fdebd3d1670c36eee057adb9e0e988;hb=b73d0e1d02e31746446a5f09f0fc830255c7243e;hp=072ff3a8c29e60dc8451bfc4a6e693f6eee5c75c;hpb=7cf3de518896b7bec9927356a71d9fa989560767;p=idzebra-moved-to-github.git

diff --git a/rset/rsprox.c b/rset/rsprox.c
index 072ff3a..60f80ab 100644
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -1,4 +1,4 @@
-/* $Id: rsprox.c,v 1.2 2004-06-14 21:44:26 adam Exp $
+/* $Id: rsprox.c,v 1.6 2004-08-04 09:59:03 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -25,8 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <assert.h>
 
-#include <rsprox.h>
 #include <zebrautl.h>
+#include <rsprox.h>
 
 #ifndef RSET_DEBUG
 #define RSET_DEBUG 0
@@ -40,7 +40,6 @@ 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);
 
@@ -53,7 +52,7 @@ static const struct rset_control control_prox =
     r_delete,
     r_rewind,
     r_forward,
-    r_count,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -85,8 +84,10 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
     const char *flags = NULL;
     int term_type = 0;
 
+
     info = (struct rset_prox_info *) xmalloc (sizeof(*info));
     memcpy(&info->p, prox_parms, sizeof(struct rset_prox_parms));
+    assert(info->p.rset_no >= 2);
     info->p.rset = xmalloc(info->p.rset_no * sizeof(*info->p.rset));
     memcpy(info->p.rset, prox_parms->rset,
 	   info->p.rset_no * sizeof(*info->p.rset));
@@ -251,7 +252,8 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 		cmp = (*info->p.cmp) (p->buf[i], p->buf[i-1]);
 		if (cmp > 1)
 		{
-		    p->more[i-1] = rset_forward (info->p.rset[i-1], p->rfd[i-1],
+		    p->more[i-1] = rset_forward (info->p.rset[i-1],
+						 p->rfd[i-1],
 						 p->buf[i-1], &dummy,
 						 info->p.cmp,
 						 p->buf[i]);
@@ -259,10 +261,12 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 		}
 		else if (cmp == 1)
 		{
-		    if ((*info->p.getseq)(p->buf[i-1]) +1 != (*info->p.getseq)(p->buf[i]))
+		    if ((*info->p.getseq)(p->buf[i-1]) +1 != 
+			(*info->p.getseq)(p->buf[i]))
 		    {
-			p->more[i-1] = rset_read (info->p.rset[i-1], p->rfd[i-1],
-						  p->buf[i-1], &dummy);
+			p->more[i-1] = rset_read (
+			    info->p.rset[i-1], p->rfd[i-1],
+			    p->buf[i-1], &dummy);
 			break;
 		    }
 		}
@@ -292,11 +296,13 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 	{
 	    int cmp = (*info->p.cmp)(p->buf[0], p->buf[1]);
 	    if (cmp < -1)
-		p->more[0] = rset_read (info->p.rset[0], p->rfd[0], p->buf[0],
-					term_index);
+		p->more[0] = rset_forward (info->p.rset[0], p->rfd[0],
+					   p->buf[0],
+					   term_index, info->p.cmp, p->buf[0]);
 	    else if (cmp > 1)
-		p->more[1] = rset_read (info->p.rset[1], p->rfd[1], p->buf[1],
-					term_index);
+		p->more[1] = rset_forward (info->p.rset[1], p->rfd[1],
+					   p->buf[1],
+					   term_index, info->p.cmp, p->buf[1]);
 	    else
 	    {
 		int seqno[500];
@@ -363,10 +369,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
     return 0;
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {