Added the scope parameter to rsets, and using it in all forwards and reads

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

diff --git a/rset/rset.c b/rset/rset.c
index 798ff8b..d4122c4 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.30 2004-08-31 14:43:42 heikki Exp $
+/* $Id: rset.c,v 1.33 2004-09-09 10:08:06 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -67,9 +67,9 @@ void rfd_delete_base(RSFD rfd)
 }
 
 
-RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
-        /* FIXME - Add keysize and cmp function */
-        /* FIXME - Add a general key-func block for cmp, dump, etc */
+RSET rset_create_base(const struct rset_control *sel, 
+                      NMEM nmem, const struct key_control *kcontrol,
+                      int scope)
 {
     RSET rnew;
     NMEM M;
@@ -89,7 +89,8 @@ RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
     rnew->count = 1;
     rnew->priv = 0;
     rnew->free_list=NULL;
-    
+    rnew->keycontrol=kcontrol;
+    rnew->scope=scope;
     return rnew;
 }
 
@@ -125,20 +126,19 @@ void rset_default_pos (RSFD rfd, double *current, double *total)
 #endif
 
 int rset_default_forward(RSFD rfd, void *buf, 
-                           int (*cmpfunc)(const void *p1, const void *p2), 
                            const void *untilbuf)
 {
     int more=1;
-    int cmp=2;
+    int cmp=rfd->rset->scope;
     logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
                     rfd->rset->control->desc, rfd->rset, rfd);
     /* key_logdump(LOG_DEBUG, untilbuf); */
-    while ( (cmp==2) && (more))
+    while ( (cmp>=rfd->rset->scope) && (more))
     {
         logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
         more=rset_read(rfd, buf);
         if (more)
-            cmp=(*cmpfunc)(untilbuf,buf);
+            cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
 /*        if (more)
             key_logdump(LOG_DEBUG,buf); */
     }