X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=rset%2Frset.c;h=d37203f0d374852e242ad8a7cfbeadd29dc7ade4;hb=863d336f803da454e03f39ee2225719fed05021e;hp=901702a623d4316aeee2697f75a2297b69888dfe;hpb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;p=idzebra-moved-to-github.git

diff --git a/rset/rset.c b/rset/rset.c
index 901702a..d37203f 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,5 +1,5 @@
-/* $Id: rset.c,v 1.18 2004-01-16 15:27:35 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rset.c,v 1.25 2004-08-20 14:44:46 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -25,25 +25,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <zebrautl.h>
+#include <assert.h>
 
 #include <rset.h>
+/* #include <../index/index.h> */ /* for log_keydump. Debugging only */
 
 RSET rset_create(const struct rset_control *sel, void *parms)
 {
     RSET rnew;
-    int i;
 
     logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
     rnew = (RSET) xmalloc(sizeof(*rnew));
     rnew->control = sel;
     rnew->flags = 0;
     rnew->count = 1;
-    rnew->rset_terms = NULL;
-    rnew->no_rset_terms = 0;
     rnew->buf = (*sel->f_create)(rnew, sel, parms);
-    logf (LOG_DEBUG, "no_rset_terms: %d", rnew->no_rset_terms);
-    for (i = 0; i<rnew->no_rset_terms; i++)
-	logf (LOG_DEBUG, " %s", rnew->rset_terms[i]->name);
     return rnew;
 }
 
@@ -52,8 +48,8 @@ void rset_delete (RSET rs)
     (rs->count)--;
     if (!rs->count)
     {
-	(*rs->control->f_delete)(rs);
-	xfree(rs);
+        (*rs->control->f_delete)(rs);
+        xfree(rs);
     }
 }
 
@@ -63,59 +59,36 @@ RSET rset_dup (RSET rs)
     return rs;
 }
 
-int rset_default_forward(RSFD rfd, void *buf, const void *untilbuf)
+void rset_default_pos (RSFD rfd, double *current, double *total)
+{ /* This should never really be needed, but it is still used in */
+  /* those rsets that we don't really plan to use, like isam-s */
+    assert(rfd);
+    assert(current);
+    assert(total);
+    *current=-1; /* signal that pos is not implemented */
+    *total=-1;
+} /* rset_default_pos */
+
+int rset_default_forward(RSET ct, RSFD rfd, void *buf, 
+                           int (*cmpfunc)(const void *p1, const void *p2), 
+                           const void *untilbuf)
 {
-    logf (LOG_FATAL, "rset_default-forward not yet implemented (%s)");
-}
-
-RSET_TERM *rset_terms(RSET rs, int *no)
-{
-    *no = rs->no_rset_terms;
-    return rs->rset_terms;
-}
-
-RSET_TERM rset_term_create (const char *name, int length, const char *flags,
-                            int type)
-{
-    RSET_TERM t = (RSET_TERM) xmalloc (sizeof(*t));
-    if (!name)
-	t->name = NULL;
-    else if (length == -1)
-	t->name = xstrdup (name);
-    else
+    int more=1;
+    int cmp=2;
+    logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
+                    ct->control->desc, ct,rfd);
+    /* key_logdump(LOG_DEBUG, untilbuf); */
+    while ( (cmp==2) && (more))
     {
-	t->name = (char*) xmalloc (length+1);
-	memcpy (t->name, name, length);
-	t->name[length] = '\0';
+        logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
+        more=rset_read(ct, rfd, buf);
+        if (more)
+            cmp=(*cmpfunc)(untilbuf,buf);
+/*        if (more)
+            key_logdump(LOG_DEBUG,buf); */
     }
-    if (!flags)
-	t->flags = NULL;
-    else
-	t->flags = xstrdup (flags);
-    t->nn = -1;
-    t->count = 0;
-    t->type = type;
-    return t;
-}
+    logf (LOG_DEBUG, "rset_default_forward exiting m=%d c=%d",more,cmp);
 
-void rset_term_destroy (RSET_TERM t)
-{
-    xfree (t->name);
-    xfree (t->flags);
-    xfree (t);
+    return more;
 }
 
-RSET_TERM rset_term_dup (RSET_TERM t)
-{
-    RSET_TERM nt = (RSET_TERM) xmalloc (sizeof(*nt));
-    if (t->name)
-	nt->name = xstrdup (t->name);
-    else
-	nt->name = NULL;
-    if (t->flags)
-	nt->flags = xstrdup (t->flags);
-    else
-	nt->flags = NULL;
-    nt->nn = t->nn;
-    return nt;
-}