X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=fed2c49f5f1e3e215eb514bab62c85759bb6ced2;hb=647212270fdb2030f6a1ab1f9880874f531847b2;hp=b13269489b421cae3856d34bd59b381ea64a9de2;hpb=1c948d94056d5eb4e55ef3192a360514d7946669;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index b132694..fed2c49 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,6 +1,6 @@
-/* $Id: rsisamb.c,v 1.27 2004-11-15 23:13:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: rsisamb.c,v 1.31 2005-04-13 13:03:48 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -22,7 +22,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <rset.h>
 #include <string.h>
 
@@ -57,14 +57,14 @@ struct rset_pp_info {
 
 struct rset_isamb_info {
     ISAMB   is;
-    ISAMB_P pos;
+    ISAM_P pos;
 };
 
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-            ISAMB is, ISAMB_P pos, TERMID term)
+RSET rsisamb_create(NMEM nmem, const struct key_control *kcontrol, int scope,
+		    ISAMB is, ISAM_P pos, TERMID term)
 {
     RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term);
     struct rset_isamb_info *info;
@@ -94,7 +94,7 @@ RSFD r_open (RSET ct, int flag)
 
     if (flag & RSETF_WRITE)
     {
-        yaz_log(LOG_FATAL, "ISAMB set type is read-only");
+        yaz_log(YLOG_FATAL, "ISAMB set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
@@ -152,6 +152,6 @@ static int r_read (RSFD rfd, void *buf, TERMID *term)
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    yaz_log(LOG_FATAL, "ISAMB set type is read-only");
+    yaz_log(YLOG_FATAL, "ISAMB set type is read-only");
     return -1;
 }