X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=316d1b91f9170acd47a8826116fca01e557121d3;hb=07a720514a9fa51ee3780389d588e257fdbab3b9;hp=6c26e8927ede49efca7301c8f0fec4b37194fb75;hpb=863d336f803da454e03f39ee2225719fed05021e;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 6c26e89..316d1b9 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.18 2004-08-20 14:44:46 heikki Exp $
+/* $Id: rsisamc.c,v 1.21 2004-08-24 14:25:16 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -29,7 +29,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <zebrautl.h>
 #include <rsisamc.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);
@@ -40,7 +39,6 @@ static int r_write (RSFD rfd, const void *buf);
 static const struct rset_control control = 
 {
     "isamc",
-    r_create,
     r_open,
     r_close,
     r_delete,
@@ -57,7 +55,6 @@ struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
-    zint *countp;
     void *buf;
 };
 
@@ -69,12 +66,36 @@ struct rset_isamc_info {
     struct rset_pp_info *ispt_list;
 };
 
+RSET rsisamc_create( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            ISAMC is, ISAMC_P pos)
+{
+    RSET rnew=rset_create_base(&control, nmem);
+    struct rset_isamc_info *info;
+    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info->key_size = key_size;
+    info->cmp = cmp;
+    info->ispt_list = NULL;
+    info->is=is;
+    info->pos=pos;
+    rnew->priv=info;
+    return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
+
+    logf (LOG_DEBUG, "rsisamc_delete");
+    assert (info->ispt_list == NULL);
+}
+
+/*
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
     rset_isamc_parms *pt = (rset_isamc_parms *) parms;
     struct rset_isamc_info *info;
 
-    ct->flags |= RSET_FLAG_VOLATILE;
     info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
@@ -83,10 +104,11 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     info->ispt_list = NULL;
     return info;
 }
+*/
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf;
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risamc_open");
@@ -122,14 +144,6 @@ static void r_close (RSFD rfd)
     assert (0);
 }
 
-static void r_delete (RSET ct)
-{
-    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf;
-
-    logf (LOG_DEBUG, "rsisamc_delete");
-    assert (info->ispt_list == NULL);
-    xfree (info);
-}
 
 static void r_rewind (RSFD rfd)
 {   
@@ -142,14 +156,6 @@ static int r_read (RSFD rfd, void *buf)
     struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
     int r;
     r = isc_pp_read(pinfo->pt, buf);
-    if (r > 0)
-    {
-        if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1)
-        {
-            memcpy (pinfo->buf, buf, pinfo->info->key_size);
-            (*pinfo->countp)++;
-        }
-    }
     return r;
 }