Added the scope parameter to rsets, and using it in all forwards and reads

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

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 273d86e..c7fb530 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.22 2004-08-26 11:11:59 heikki Exp $
+/* $Id: rsisamc.c,v 1.25 2004-09-09 10:08:06 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <string.h>
 #include <zebrautl.h>
-#include <rsisamc.h>
+#include <rset.h>
 
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
@@ -35,16 +35,17 @@ static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
 static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
+static void r_pos (RSFD rfd, double *current, double *total);
 
 static const struct rset_control control = 
 {
     "isamc",
+    r_delete,
     r_open,
     r_close,
-    r_delete,
     r_rewind,
     rset_default_forward,
-    rset_default_pos,
+    r_pos,
     r_read,
     r_write,
 };
@@ -53,31 +54,20 @@ const struct rset_control *rset_kind_isamc = &control;
 
 struct rset_pp_info {
     ISAMC_PP pt;
-    struct rset_pp_info *next;
-    struct rset_isamc_info *info;
     void *buf;
 };
 
 struct rset_isamc_info {
     ISAMC   is;
     ISAMC_P pos;
-    int key_size;
-    int (*cmp)(const void *p1, const void *p2);
-    struct rset_pp_info *ispt_list;
-    struct rset_pp_info *free_list;
 };
 
-RSET rsisamc_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMC is, ISAMC_P pos)
+RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+                             ISAMC is, ISAMC_P pos)
 {
-    RSET rnew=rset_create_base(&control, nmem);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
     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->free_list = NULL;
     info->is=is;
     info->pos=pos;
     rnew->priv=info;
@@ -86,31 +76,13 @@ RSET rsisamc_create( NMEM nmem, int key_size,
 
 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;
-
-    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;
-    return info;
-}
-*/
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
+    RSFD rfd;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risamc_open");
@@ -119,51 +91,37 @@ RSFD r_open (RSET ct, int flag)
         logf (LOG_FATAL, "ISAMC set type is read-only");
         return NULL;
     }
-    ptinfo = info->free_list;
-    if (ptinfo)
-        info->free_list=ptinfo->next;
+    rfd = rfd_create_base(ct);
+    if (rfd->priv)
+        ptinfo=(struct rset_pp_info *)rfd->priv;
     else {
         ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
-        ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
+        rfd->priv=ptinfo;
+        ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
     }
-    ptinfo->next = info->ispt_list;
-    info->ispt_list = ptinfo;
-    ptinfo->pt = isc_pp_open (info->is, info->pos);
-    ptinfo->info = info;
-    return ptinfo;
+    return rfd;
 }
 
 static void r_close (RSFD rfd)
 {
-    struct rset_isamc_info *info = ((struct rset_pp_info*) rfd)->info;
-    struct rset_pp_info **ptinfop;
-
-    for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
-        if (*ptinfop == rfd)
-        {
-            struct rset_pp_info *tmp=(struct rset_pp_info*) rfd;
-            isc_pp_close ((*ptinfop)->pt);
-            *ptinfop = (*ptinfop)->next;
-            tmp->next=info->free_list;
-            info->free_list=tmp;
-            return;
-        }
-    logf (LOG_FATAL, "r_close but no rfd match!");
-    assert (0);
+    struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
+
+    isc_pp_close (p->pt);
+    rfd_delete_base(rfd);
 }
 
 
 static void r_rewind (RSFD rfd)
 {   
-    logf (LOG_DEBUG, "rsisamc_rewind");
+    logf (LOG_FATAL, "rsisamc_rewind");
     abort ();
 }
 
 static int r_read (RSFD rfd, void *buf)
 {
-    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+    struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
     int r;
-    r = isc_pp_read(pinfo->pt, buf);
+    r = isc_pp_read(p->pt, buf);
     return r;
 }
 
@@ -172,3 +130,10 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
+
+static void r_pos (RSFD rfd, double *current, double *total)
+{
+    *current=-1;  /* sorry, not implemented yet */
+    *total=-1;
+}
+