X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisams.c;h=5fd70cf94fcae151fd6f413fe48f9688945d7a6e;hp=28bb5e5e7257a9aa0b3d1bd197133fb964f4173f;hb=7a2d0f25682890bde5d8f2883d6020df2ed0b365;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 28bb5e5..5fd70cf 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,4 +1,4 @@
-/* $Id: rsisams.c,v 1.19 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsisams.c,v 1.23 2005-05-24 11:35:43 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <idzebra/util.h>
@@ -41,48 +39,45 @@ static const struct rset_control control =
     rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no foward */
     r_pos,
     r_read,
     r_write,
 };
 
-const struct rset_control *rset_kind_isams = &control;
-
-struct rset_pp_info {
+struct rfd_private {
     ISAMS_PP pt;
 };
 
-struct rset_isams_info {
+struct rset_private {
     ISAMS   is;
-    ISAMS_P pos;
+    ISAM_P pos;
 };
 
 
-RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-            ISAMS is, ISAMS_P pos, TERMID term)
+RSET rsisams_create(NMEM nmem, struct rset_key_control *kcontrol,
+		    int scope,
+		    ISAMS is, ISAM_P pos, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
-    struct rset_isams_info *info;
-    info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
-    rnew->priv=info;
-    info->is=is;
-    info->pos=pos;
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
+    struct rset_private *info;
+    info = (struct rset_private *) nmem_malloc(rnew->nmem,sizeof(*info));
+    rnew->priv = info;
+    info->is = is;
+    info->pos = pos;
     return rnew;
 }
 
 static void r_delete (RSET ct)
 {
     yaz_log (YLOG_DEBUG, "rsisams_delete");
-    rset_delete(ct);
 }
 
-
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+    struct rset_private *info = (struct rset_private *) ct->priv;
     RSFD rfd;
-    struct rset_pp_info *ptinfo;
+    struct rfd_private *ptinfo;
 
     yaz_log (YLOG_DEBUG, "risams_open");
     if (flag & RSETF_WRITE)
@@ -92,9 +87,9 @@ RSFD r_open (RSET ct, int flag)
     }
     rfd=rfd_create_base(ct);
     if (rfd->priv)
-        ptinfo=(struct rset_pp_info *)(rfd->priv);
+        ptinfo=(struct rfd_private *)(rfd->priv);
     else {
-        ptinfo = (struct rset_pp_info *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
+        ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
         ptinfo->pt = isams_pp_open (info->is, info->pos);
         rfd->priv=ptinfo;
     }
@@ -103,16 +98,15 @@ RSFD r_open (RSET ct, int flag)
 
 static void r_close (RSFD rfd)
 {
-    struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+    struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
 
     isams_pp_close (ptinfo->pt);
-    rfd_delete_base(rfd);
 }
 
 
 static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+    struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
     int rc;
     rc=isams_pp_read(ptinfo->pt, buf);
     if (rc && term)