Updates for YAZ 2.0.29: Include yaz/log.h. Not (only) yaz/yaz-util.h

diff --git a/include/zebraapi.h b/include/zebraapi.h
index 4488047..805ba45 100644 (file)
--- a/include/zebraapi.h
+++ b/include/zebraapi.h
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.h,v 1.14 2004-08-04 08:35:23 adam Exp $
+/* $Id: zebraapi.h,v 1.13.2.1 2004-11-26 11:06:12 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -29,6 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef ZEBRAAPI_H
 #define ZEBRAAPI_H
 
+#include <yaz/log.h>
 #include <yaz/odr.h>
 #include <yaz/oid.h>
 #include <yaz/proto.h>
@@ -62,7 +63,7 @@ typedef struct {
     int len;             /* length */
     oid_value format;    /* record syntax */
     char *base; 
-    SYSNO sysno;
+    int  sysno;
     int  score;
 } ZebraRetrievalRecord;
 
@@ -210,17 +211,17 @@ int zebra_add_record (ZebraHandle zh, const char *buf, int buf_size);
                               
 int zebra_insert_record (ZebraHandle zh, 
                         const char *recordType,
-                        SYSNO *sysno, const char *match, const char *fname,
+                        int *sysno, const char *match, const char *fname,
                         const char *buf, int buf_size,
                         int force_update);
 int zebra_update_record (ZebraHandle zh, 
                         const char *recordType,
-                        SYSNO *sysno, const char *match, const char *fname,
+                        int* sysno, const char *match, const char *fname,
                         const char *buf, int buf_size,
                         int force_update);
 int zebra_delete_record (ZebraHandle zh, 
                         const char *recordType,
-                        SYSNO *sysno, const char *match, const char *fname,
+                        int *sysno, const char *match, const char *fname,
                         const char *buf, int buf_size,
                         int force_update);
 
@@ -229,11 +230,11 @@ YAZ_EXPORT int zebra_resultSetTerms (ZebraHandle zh, const char *setname,
                                      int *type, char *out, size_t *len);
 
 YAZ_EXPORT int zebra_sort (ZebraHandle zh, ODR stream,
-                          int num_input_setnames,
-                          const char **input_setnames,
-                          const char *output_setname,
-                          Z_SortKeySpecList *sort_sequence,
-                          int *sort_status);
+                            int num_input_setnames,
+                            const char **input_setnames,
+                            const char *output_setname,
+                            Z_SortKeySpecList *sort_sequence,
+                            int *sort_status);
 
 YAZ_EXPORT
 int zebra_select_databases (ZebraHandle zh, int num_bases, 

diff --git a/include/zebrautl.h b/include/zebrautl.h
index 753815d..2bfa5e0 100644 (file)
--- a/include/zebrautl.h
+++ b/include/zebrautl.h
@@ -1,5 +1,5 @@
-/* $Id: zebrautl.h,v 1.8 2004-08-04 08:35:23 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: zebrautl.h,v 1.7.2.1 2004-11-26 11:06:12 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -23,12 +23,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef ZEBRA_UTIL_H
 #define ZEBRA_UTIL_H
 
+#include <yaz/log.h>
 #include <yaz/yaz-util.h>
 #include <res.h>
 #include <zebraver.h>
 
-YAZ_BEGIN_CDECL
-zint atoi_zn (const char *buf, zint len);
-YAZ_END_CDECL
-
 #endif

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 89450e8..ff98ef1 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.120.2.1 2004-09-09 10:43:18 adam Exp $
+/* $Id: zebraapi.c,v 1.120.2.2 2004-11-26 11:06:12 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <unistd.h>
 #endif
 
+#include <yaz/log.h>
 #include <yaz/diagbib1.h>
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>

diff --git a/index/zrpn.c b/index/zrpn.c
index 2f1a139..de5fe0a 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.141.2.3 2004-11-15 22:52:48 adam Exp $
+/* $Id: zrpn.c,v 1.141.2.4 2004-11-26 11:06:13 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -971,7 +971,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
             if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value,
                                            use_string)))
             {
-                yaz_log(LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
+                yaz_log(LOG_LOG, "att_getentbyatt fail. set=%d use=%d r=%d",
                       curAttributeSet, use_value, r);
                 if (r == -1)
                 {

diff --git a/util/charmap.c b/util/charmap.c
index 898f133..b2e8ed3 100644 (file)
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,4 +1,4 @@
-/* $Id: charmap.c,v 1.29.2.2 2004-09-16 14:07:51 adam Exp $
+/* $Id: charmap.c,v 1.29.2.3 2004-11-26 11:06:13 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -33,10 +33,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 typedef unsigned ucs4_t;
 
-#include <yaz/yaz-util.h>
+#include <zebrautl.h>
 #include <charmap.h>
 
-
 #define CHR_MAXSTR 1024
 #define CHR_MAXEQUIV 32
 

diff --git a/util/res.c b/util/res.c
index 89ee5c6..512a006 100644 (file)
--- a/util/res.c
+++ b/util/res.c
@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.37 2004-07-26 13:59:25 adam Exp $
+/* $Id: res.c,v 1.37.2.1 2004-11-26 11:06:13 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -31,7 +31,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include <zebrautl.h>
-#include <yaz/yaz-util.h>
 
 struct res_entry {
     char *name;

diff --git a/util/zebramap.c b/util/zebramap.c
index c1983e3..7b38b04 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,4 +1,4 @@
-/* $Id: zebramap.c,v 1.32.2.1 2004-09-16 14:07:51 adam Exp $
+/* $Id: zebramap.c,v 1.32.2.2 2004-11-26 11:06:13 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <ctype.h>
 
-#include <yaz/yaz-util.h>
+#include <zebrautl.h>
 #include <charmap.h>
 #include <zebramap.h>