Move headers zebraapi.h->idzebra/api.h, zebraver.h->idzebra/version.h,

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

diff --git a/rset/rset.c b/rset/rset.c
index a89191e..e24ef47 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.19 2004-01-22 11:27:22 adam Exp $
+/* $Id: rset.c,v 1.28 2004-08-24 15:00:16 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -25,25 +25,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <zebrautl.h>
-
+#include <assert.h>
+#include <yaz/nmem.h>
 #include <rset.h>
 
-RSET rset_create(const struct rset_control *sel, void *parms)
+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 rnew;
-    int i;
-
+    NMEM M;
     logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
-    rnew = (RSET) xmalloc(sizeof(*rnew));
+    if (nmem) 
+        M=nmem;
+    else
+        M=nmem_create();
+    rnew = (RSET) nmem_malloc(M,sizeof(*rnew));
+    rnew->nmem=M;
+    if (nmem)
+        rnew->my_nmem=0;
+    else 
+        rnew->my_nmem=1;
     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);
+    rnew->priv = 0;
+    
     return rnew;
 }
 
@@ -52,8 +58,9 @@ void rset_delete (RSET rs)
     (rs->count)--;
     if (!rs->count)
     {
-       (*rs->control->f_delete)(rs);
-       xfree(rs);
+        (*rs->control->f_delete)(rs);
+        if (rs->my_nmem)
+            nmem_destroy(rs->nmem);
     }
 }
 
@@ -63,60 +70,36 @@ RSET rset_dup (RSET rs)
     return rs;
 }
 
-int rset_default_forward(RSFD rfd, void *buf, const void *untilbuf)
-{
-    logf (LOG_FATAL, "rset_default-forward not yet implemented");
-    return 0;
-}
-
-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)
+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)
 {
-    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;
-}