X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamc.c;h=39af63a1a7d68d718a475bbf2d5a945c61f9e3ce;hp=09a0c2970903b2776c8cce9f0ea63e6b28109e7b;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 09a0c29..39af63a 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,8 +1,5 @@
-/* $Id: rsisamc.c,v 1.35 2005-01-15 19:38:34 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,18 +12,18 @@ 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>
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <rset.h>
 
 static RSFD r_open (RSET ct, int flag);
@@ -43,14 +40,12 @@ 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_isamc = &control;
-
 struct rset_pp_info {
     ISAMC_PP pt;
     void *buf;
@@ -58,23 +53,24 @@ struct rset_pp_info {
 
 struct rset_isamc_info {
     ISAMC   is;
-    ISAMC_P pos;
+    ISAM_P pos;
 };
 
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-                             ISAMC is, ISAMC_P pos, TERMID term)
+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;
@@ -108,7 +104,7 @@ RSFD r_open (RSET ct, int flag)
         rfd->priv = ptinfo;
         ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
     }
-    ptinfo->pt = isc_pp_open(info->is, info->pos);
+    ptinfo->pt = isamc_pp_open(info->is, info->pos);
     return rfd;
 }
 
@@ -116,8 +112,7 @@ static void r_close (RSFD rfd)
 {
     struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
 
-    isc_pp_close(p->pt);
-    rfd_delete_base(rfd);
+    isamc_pp_close(p->pt);
 }
 
 
@@ -125,7 +120,7 @@ static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
     int r;
-    r = isc_pp_read(p->pt, buf);
+    r = isamc_pp_read(p->pt, buf);
     if (term)
         *term = rfd->rset->term;
     yaz_log(log_level, "isamc.r_read");
@@ -146,3 +141,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
+ */
+