X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=79ee4f4f68f373355c26db2d576cc656375b4d3e;hb=927733195c5646988dcc65365bb45b978b02a15a;hp=30f3cd704d901e9b26125c4b8fd9b070dcbec885;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 30f3cd7..79ee4f4 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,4 +1,4 @@
-/* $Id: rsisams.c,v 1.6 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisams.c,v 1.10 2004-08-24 14:25:16 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -24,21 +24,19 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <assert.h>
-#include <rsisams.h>
 #include <zebrautl.h>
+#include <rsisams.h>
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control = 
 {
     "isams",
-    r_create,
     r_open,
     r_close,
     r_delete,
@@ -63,40 +61,62 @@ struct rset_isams_info {
     struct rset_pp_info *ispt_list;
 };
 
+
+RSET rsisams_create( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            ISAMS is, ISAMS_P pos)
+{
+    RSET rnew=rset_create_base(&control, nmem);
+    struct rset_isams_info *info;
+    info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    assert(key_size); /* FIXME - these belong to the general rset */
+    assert(cmp);
+    info->is=is;
+    info->pos=pos;
+    info->ispt_list = NULL;
+    rnew->priv=info;
+    return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+
+    logf (LOG_DEBUG, "rsisams_delete");
+    assert (info->ispt_list == NULL);
+    /* xfree (info); */
+}
+
+#if 0
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
     rset_isams_parms *pt = (struct rset_isams_parms *) parms;
     struct rset_isams_info *info;
 
-    ct->flags |= RSET_FLAG_VOLATILE;
     info = (struct rset_isams_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
     info->ispt_list = NULL;
-    ct->no_rset_terms = 1;
-    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
-    ct->rset_terms[0] = pt->rset_term;
     return info;
 }
+#endif
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risams_open");
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "ISAMS set type is read-only");
-	return NULL;
+        logf (LOG_FATAL, "ISAMS set type is read-only");
+        return NULL;
     }
     ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
     ptinfo->pt = isams_pp_open (info->is, info->pos);
     ptinfo->info = info;
-    if (ct->rset_terms[0]->nn < 0)
-	ct->rset_terms[0]->nn = isams_pp_num (ptinfo->pt);
     return ptinfo;
 }
 
@@ -117,17 +137,6 @@ static void r_close (RSFD rfd)
     assert (0);
 }
 
-static void r_delete (RSET ct)
-{
-    struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
-
-    logf (LOG_DEBUG, "rsisams_delete");
-    assert (info->ispt_list == NULL);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
-    xfree (info);
-}
-
 static void r_rewind (RSFD rfd)
 {   
     logf (LOG_DEBUG, "rsisams_rewind");
@@ -135,9 +144,8 @@ static void r_rewind (RSFD rfd)
 }
 
 
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
-    *term_index = 0;
     return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
 }