Fix various order for various linking steps. Add Tcl libs.

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

diff --git a/rset/rset.c b/rset/rset.c
index d37203f..e24ef47 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.25 2004-08-20 14:44:46 heikki 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
 
@@ -26,20 +26,30 @@ 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;
-
+    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->buf = (*sel->f_create)(rnew, sel, parms);
+    rnew->priv = 0;
+    
     return rnew;
 }
 
@@ -49,7 +59,8 @@ void rset_delete (RSET rs)
     if (!rs->count)
     {
         (*rs->control->f_delete)(rs);
-        xfree(rs);
+        if (rs->my_nmem)
+            nmem_destroy(rs->nmem);
     }
 }