X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=6dc39830972fa0245e2006a4730d78bb286960c1;hb=f6dbdf7151bbdfaf47ec281a71ed6ef49b596f29;hp=4f8fad1b254a065c0e47a709280dd065950e76f7;hpb=1c948d94056d5eb4e55ef3192a360514d7946669;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 4f8fad1..6dc3983 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,6 +1,6 @@
-/* $Id: rsisamc.c,v 1.32 2004-11-15 23:13:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: rsisamc.c,v 1.37 2005-04-13 13:03:49 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -26,7 +26,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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);
@@ -58,14 +58,14 @@ 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, const struct 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;
@@ -97,7 +97,7 @@ RSFD r_open (RSET ct, int flag)
     yaz_log(log_level, "risamc_open");
     if (flag & RSETF_WRITE)
     {
-        yaz_log(LOG_FATAL, "ISAMC set type is read-only");
+        yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
@@ -108,7 +108,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 +116,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,16 +125,16 @@ 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;
 }
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    yaz_log(LOG_FATAL, "ISAMC set type is read-only");
+    yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }