X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisams.c;h=7236fc203d7e784175a1808d2b9c12ec579120e0;hp=b30df9c6ebfeeb6a672aac1e2791f019e17c85d6;hb=3bb2fd863b1664f1ff71dadb540313f301ca234f;hpb=ecf94fc25324414287d3bbfbeba4440e558edd17

diff --git a/rset/rsisams.c b/rset/rsisams.c
index b30df9c..7236fc2 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,8 +1,5 @@
-/* $Id: rsisams.c,v 1.20 2005-04-13 13:03:50 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,13 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 forward */
     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;
     ISAM_P pos;
 };
 
 
-RSET rsisams_create(NMEM nmem, const struct key_control *kcontrol, int scope,
+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)
@@ -90,33 +85,31 @@ RSFD r_open (RSET ct, int flag)
         yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
         return NULL;
     }
-    rfd=rfd_create_base(ct);
+    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->pt = isams_pp_open (info->is, info->pos);
-        rfd->priv=ptinfo;
+        ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
+        rfd->priv = ptinfo;
     }
+    ptinfo->pt = isams_pp_open (info->is, info->pos);
     return rfd;
 }
 
 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);
-    int rc;
-    rc=isams_pp_read(ptinfo->pt, buf);
+    struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
+    int rc = isams_pp_read(ptinfo->pt, buf);
     if (rc && term)
-        *term=rfd->rset->term;
+        *term = rfd->rset->term;
     return rc;
 }
 
@@ -133,3 +126,12 @@ static void r_pos (RSFD rfd, double *current, double *total)
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+