X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=43568eb7201a17dcd105e38501b8c896996854e7;hb=2ca7b6bfd7e8d9a2cb9c36bf2520b46511a594eb;hp=d01d60187b2a6f8f43c0a990683330dc683d83d9;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index d01d601..43568eb 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,6 +1,6 @@
-/* $Id: rsisamc.c,v 1.33 2004-11-19 10:27:14 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $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.
 
@@ -20,13 +20,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
-
 #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);
@@ -49,8 +46,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_isamc = &control;
-
 struct rset_pp_info {
     ISAMC_PP pt;
     void *buf;
@@ -58,14 +53,15 @@ 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);
     struct rset_isamc_info *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,7 +112,7 @@ static void r_close (RSFD rfd)
 {
     struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
 
-    isc_pp_close(p->pt);
+    isamc_pp_close(p->pt);
     rfd_delete_base(rfd);
 }
 
@@ -125,10 +121,10 @@ 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,"read returning term %p", *term);
+    yaz_log(log_level, "isamc.r_read");
     return r;
 }