X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=588d88c4ac11e94d30575829c7e25ab001fe8e12;hb=2c2827a0071c5a5511e1489c456ce64fdd42364a;hp=43568eb7201a17dcd105e38501b8c896996854e7;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 43568eb..588d88c 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,8 +1,5 @@
-/* $Id: rsisamc.c,v 1.39 2005-05-03 09:11:36 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) 2004-2013 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,11 +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 <string.h>
@@ -30,20 +30,19 @@ static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static int r_read (RSFD rfd, void *buf, TERMID *term);
-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 = 
+static const struct rset_control control =
 {
     "isamc",
     r_delete,
     rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no forward */
     r_pos,
     r_read,
-    r_write,
+    rset_no_write,
 };
 
 struct rset_pp_info {
@@ -63,14 +62,14 @@ RSET rsisamc_create(NMEM nmem, struct rset_key_control *kcontrol,
 		    int scope,
 		    ISAMC is, ISAM_P pos, TERMID term)
 {
-    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
     struct rset_isamc_info *info;
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("rsisamc");
         log_level_initialized = 1;
     }
-    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem, sizeof(*info));
     info->is = is;
     info->pos = pos;
     rnew->priv = info;
@@ -113,7 +112,6 @@ static void r_close (RSFD rfd)
     struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
 
     isamc_pp_close(p->pt);
-    rfd_delete_base(rfd);
 }
 
 
@@ -128,12 +126,6 @@ static int r_read (RSFD rfd, void *buf, TERMID *term)
     return r;
 }
 
-static int r_write (RSFD rfd, const void *buf)
-{
-    yaz_log(YLOG_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 */
@@ -141,4 +133,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
+ */