Cleaned up the creation of rsets, added nmem

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

diff --git a/rset/rset.c b/rset/rset.c
index dbf7b7b..15954d8 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.23 2004-08-06 10:09:28 heikki Exp $
+/* $Id: rset.c,v 1.27 2004-08-24 14:25:16 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -26,26 +26,27 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <zebrautl.h>
 #include <assert.h>
-
+#include <yaz/nmem.h>
 #include <rset.h>
-#include <../index/index.h> /* for log_keydump. Debugging only */
 
-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;
 
     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);
+    rnew->priv = 0;
+    rnew->nmem=nmem;
+    if (nmem)
+        rnew->my_nmem=0;
+    else {
+        rnew->nmem=nmem_create();
+        rnew->my_nmem=1;
+    }
     return rnew;
 }
 
@@ -54,8 +55,10 @@ 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);
+        xfree(rs);
     }
 }
 
@@ -75,7 +78,7 @@ void rset_default_pos (RSFD rfd, double *current, double *total)
     *total=-1;
 } /* rset_default_pos */
 
-int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index, 
+int rset_default_forward(RSET ct, RSFD rfd, void *buf, 
                            int (*cmpfunc)(const void *p1, const void *p2), 
                            const void *untilbuf)
 {
@@ -83,69 +86,18 @@ int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
     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);
+    /* key_logdump(LOG_DEBUG, untilbuf); */
     while ( (cmp==2) && (more))
     {
         logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
-        more=rset_read(ct, rfd, buf, term_index);
+        more=rset_read(ct, rfd, buf);
         if (more)
             cmp=(*cmpfunc)(untilbuf,buf);
-        if (more)
-            key_logdump(LOG_DEBUG,buf);
+/*        if (more)
+            key_logdump(LOG_DEBUG,buf); */
     }
     logf (LOG_DEBUG, "rset_default_forward exiting m=%d c=%d",more,cmp);
 
     return more;
 }
 
-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
-    {
-       t->name = (char*) xmalloc (length+1);
-       memcpy (t->name, name, length);
-       t->name[length] = '\0';
-    }
-    if (!flags)
-       t->flags = NULL;
-    else
-       t->flags = xstrdup (flags);
-    t->nn = -1;
-    t->count = 0;
-    t->type = type;
-    return t;
-}
-
-void rset_term_destroy (RSET_TERM t)
-{
-    xfree (t->name);
-    xfree (t->flags);
-    xfree (t);
-}
-
-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;
-}