Using a bit more of those nmems in rsets

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

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index cb90afd..316d1b9 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.14 2004-01-29 13:11:01 adam 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,25 +29,22 @@ 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);
 static void r_rewind (RSFD rfd);
-static int r_count (RSET ct);
-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 = 
 {
     "isamc",
-    r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
     rset_default_forward,
-    r_count,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -58,7 +55,6 @@ struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
-    int *countp;
     void *buf;
 };
 
@@ -70,27 +66,49 @@ 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;
     info->key_size = pt->key_size;
     info->cmp = pt->cmp;
     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;
 }
+*/
 
 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");
@@ -104,10 +122,6 @@ RSFD r_open (RSET ct, int flag)
     info->ispt_list = ptinfo;
     ptinfo->pt = isc_pp_open (info->is, info->pos);
     ptinfo->info = info;
-    if (ct->rset_terms[0]->nn < 0)
-       ct->rset_terms[0]->nn = isc_pp_num (ptinfo->pt);
-    ct->rset_terms[0]->count = 0;
-    ptinfo->countp = &ct->rset_terms[0]->count;
     ptinfo->buf = xmalloc (info->key_size);
     return ptinfo;
 }
@@ -130,16 +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);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
-    xfree (info);
-}
 
 static void r_rewind (RSFD rfd)
 {   
@@ -147,25 +151,11 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
-
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
     struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
     int r;
-    *term_index = 0;
     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;
 }