projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
70ac1af
)
using yaz/log.h again
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 13 Dec 2004 20:51:27 +0000
(20:51 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 13 Dec 2004 20:51:27 +0000
(20:51 +0000)
48 files changed:
configure.in
patch
|
blob
|
history
data1/d1_absyn.c
patch
|
blob
|
history
data1/d1_attset.c
patch
|
blob
|
history
data1/d1_doespec.c
patch
|
blob
|
history
data1/d1_espec.c
patch
|
blob
|
history
data1/d1_expout.c
patch
|
blob
|
history
data1/d1_grs.c
patch
|
blob
|
history
data1/d1_handle.c
patch
|
blob
|
history
data1/d1_if.c
patch
|
blob
|
history
data1/d1_map.c
patch
|
blob
|
history
data1/d1_marc.c
patch
|
blob
|
history
data1/d1_prtree.c
patch
|
blob
|
history
data1/d1_read.c
patch
|
blob
|
history
data1/d1_sumout.c
patch
|
blob
|
history
data1/d1_tagset.c
patch
|
blob
|
history
data1/d1_varset.c
patch
|
blob
|
history
dict/dcompact.c
patch
|
blob
|
history
dict/dict-p.h
patch
|
blob
|
history
include/idzebra/bfile.h
patch
|
blob
|
history
include/idzebra/data1.h
patch
|
blob
|
history
include/idzebra/dict.h
patch
|
blob
|
history
include/zebrautl.h
patch
|
blob
|
history
index/apitest.c
patch
|
blob
|
history
index/attribute.c
patch
|
blob
|
history
index/main.c
patch
|
blob
|
history
index/sortidx.c
patch
|
blob
|
history
index/zebrash.c
patch
|
blob
|
history
index/zserver.c
patch
|
blob
|
history
isamb/isamb.c
patch
|
blob
|
history
isamb/tstisamb.c
patch
|
blob
|
history
isamc/isamc.c
patch
|
blob
|
history
isamc/merge.c
patch
|
blob
|
history
isams/isams.c
patch
|
blob
|
history
perl/zebra_perl.c
patch
|
blob
|
history
recctrl/danbibr.c
patch
|
blob
|
history
recctrl/inline.c
patch
|
blob
|
history
recctrl/marcomp.c
patch
|
blob
|
history
recctrl/marcread.c
patch
|
blob
|
history
recctrl/recgrs.c
patch
|
blob
|
history
recctrl/sgmlread.c
patch
|
blob
|
history
recctrl/xmlread.c
patch
|
blob
|
history
test/Makefile.am
patch
|
blob
|
history
test/api/testlib.c
patch
|
blob
|
history
test/api/testlib.h
patch
|
blob
|
history
util/charmap.c
patch
|
blob
|
history
util/passwddb.c
patch
|
blob
|
history
util/zebramap.c
patch
|
blob
|
history
yaz.m4
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
943bf06
..
9ba97b8
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,5
+1,5
@@
dnl Zebra, Index Data Aps, 1995-2004
dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.109 2004-12-08 09:12:50 adam Exp $
+dnl $Id: configure.in,v 1.110 2004-12-13 20:51:27 adam Exp $
dnl
AC_INIT(include/idzebra/version.h)
AM_INIT_AUTOMAKE(idzebra,1.4.0)
dnl
AC_INIT(include/idzebra/version.h)
AM_INIT_AUTOMAKE(idzebra,1.4.0)
@@
-299,6
+299,7
@@
AC_OUTPUT([
test/xelm/Makefile
test/dmoz/Makefile test/sort/Makefile test/zsh/Makefile
test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
test/xelm/Makefile
test/dmoz/Makefile test/sort/Makefile test/zsh/Makefile
test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
+ test/espec/Makefile
examples/Makefile examples/gils/Makefile examples/zthes/Makefile
idzebra.spec
idzebra-config
examples/Makefile examples/gils/Makefile examples/zthes/Makefile
idzebra.spec
idzebra-config
diff --git
a/data1/d1_absyn.c
b/data1/d1_absyn.c
index
3dca2f7
..
45620d5
100644
(file)
--- a/
data1/d1_absyn.c
+++ b/
data1/d1_absyn.c
@@
-1,4
+1,4
@@
-/* $Id: d1_absyn.c,v 1.15 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_absyn.c,v 1.16 2004-12-13 20:51:27 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-25,8
+25,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <idzebra/data1.h>
#include <zebra_xpath.h>
#include <d1_absyn.h>
#include <idzebra/data1.h>
#include <zebra_xpath.h>
#include <d1_absyn.h>
diff --git
a/data1/d1_attset.c
b/data1/d1_attset.c
index
4e234fa
..
4d28c67
100644
(file)
--- a/
data1/d1_attset.c
+++ b/
data1/d1_attset.c
@@
-1,4
+1,4
@@
-/* $Id: d1_attset.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_attset.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
diff --git
a/data1/d1_doespec.c
b/data1/d1_doespec.c
index
7a86264
..
136c6be
100644
(file)
--- a/
data1/d1_doespec.c
+++ b/
data1/d1_doespec.c
@@
-1,4
+1,4
@@
-/* $Id: d1_doespec.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_doespec.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-22,8
+22,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <assert.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
diff --git
a/data1/d1_espec.c
b/data1/d1_espec.c
index
34778a3
..
3707776
100644
(file)
--- a/
data1/d1_espec.c
+++ b/
data1/d1_espec.c
@@
-1,4
+1,4
@@
-/* $Id: d1_espec.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_espec.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,9
+24,9
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/odr.h>
#include <yaz/proto.h>
#include <yaz/odr.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
#include <idzebra/data1.h>
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
#include <idzebra/data1.h>
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
diff --git
a/data1/d1_expout.c
b/data1/d1_expout.c
index
8b9886c
..
9a85cec
100644
(file)
--- a/
data1/d1_expout.c
+++ b/
data1/d1_expout.c
@@
-1,4
+1,4
@@
-/* $Id: d1_expout.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_expout.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-28,7
+28,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
diff --git
a/data1/d1_grs.c
b/data1/d1_grs.c
index
2aeac01
..
7f268b1
100644
(file)
--- a/
data1/d1_grs.c
+++ b/
data1/d1_grs.c
@@
-1,4
+1,4
@@
-/* $Id: d1_grs.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_grs.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-26,7
+26,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <yaz/proto.h>
#include <stdlib.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <d1_absyn.h>
#define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
#include <d1_absyn.h>
#define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
diff --git
a/data1/d1_handle.c
b/data1/d1_handle.c
index
c7a8825
..
4b49d2e
100644
(file)
--- a/
data1/d1_handle.c
+++ b/
data1/d1_handle.c
@@
-1,4
+1,4
@@
-/* $Id: d1_handle.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_handle.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-23,7
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
struct data1_handle_info {
#include <idzebra/data1.h>
struct data1_handle_info {
diff --git
a/data1/d1_if.c
b/data1/d1_if.c
index
7e819a9
..
ef7d0cf
100644
(file)
--- a/
data1/d1_if.c
+++ b/
data1/d1_if.c
@@
-1,4
+1,4
@@
-/* $Id: d1_if.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_if.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-26,7
+26,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <idzebra/data1.h>
#include <string.h>
#include <idzebra/data1.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <string.h>
#include <string.h>
diff --git
a/data1/d1_map.c
b/data1/d1_map.c
index
1b746a1
..
94ff9e8
100644
(file)
--- a/
data1/d1_map.c
+++ b/
data1/d1_map.c
@@
-1,4
+1,4
@@
-/* $Id: d1_map.c,v 1.6 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_map.c,v 1.7 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,8
+24,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
diff --git
a/data1/d1_marc.c
b/data1/d1_marc.c
index
511de28
..
d2b6dae
100644
(file)
--- a/
data1/d1_marc.c
+++ b/
data1/d1_marc.c
@@
-1,4
+1,4
@@
-/* $Id: d1_marc.c,v 1.8 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_marc.c,v 1.9 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
@@
-26,8
+26,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/marcdisp.h>
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
#include <yaz/marcdisp.h>
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
diff --git
a/data1/d1_prtree.c
b/data1/d1_prtree.c
index
3986c3b
..
5404fb2
100644
(file)
--- a/
data1/d1_prtree.c
+++ b/
data1/d1_prtree.c
@@
-1,4
+1,4
@@
-/* $Id: d1_prtree.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_prtree.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
@@
-20,7
+20,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
static void pr_string (FILE *out, const char *str, int len)
#include <idzebra/data1.h>
static void pr_string (FILE *out, const char *str, int len)
diff --git
a/data1/d1_read.c
b/data1/d1_read.c
index
f19b20e
..
f169487
100644
(file)
--- a/
data1/d1_read.c
+++ b/
data1/d1_read.c
@@
-1,4
+1,4
@@
-/* $Id: d1_read.c,v 1.12 2004-12-10 11:56:21 heikki Exp $
+/* $Id: d1_read.c,v 1.13 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-29,18
+29,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <d1_absyn.h>
data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
#include <d1_absyn.h>
data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
diff --git
a/data1/d1_sumout.c
b/data1/d1_sumout.c
index
d66a22e
..
a65e795
100644
(file)
--- a/
data1/d1_sumout.c
+++ b/
data1/d1_sumout.c
@@
-1,4
+1,4
@@
-/* $Id: d1_sumout.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_sumout.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
diff --git
a/data1/d1_tagset.c
b/data1/d1_tagset.c
index
56bd25a
..
fdf2309
100644
(file)
--- a/
data1/d1_tagset.c
+++ b/
data1/d1_tagset.c
@@
-1,4
+1,4
@@
-/* $Id: d1_tagset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_tagset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
/*
#include <idzebra/data1.h>
/*
diff --git
a/data1/d1_varset.c
b/data1/d1_varset.c
index
92c95a5
..
5661a6b
100644
(file)
--- a/
data1/d1_varset.c
+++ b/
data1/d1_varset.c
@@
-1,4
+1,4
@@
-/* $Id: d1_varset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_varset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <yaz/oid.h>
#include <stdlib.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
diff --git
a/dict/dcompact.c
b/dict/dcompact.c
index
56f27ec
..
1c7ca92
100644
(file)
--- a/
dict/dcompact.c
+++ b/
dict/dcompact.c
@@
-1,4
+1,4
@@
-/* $Id: dcompact.c,v 1.11 2004-12-08 12:23:08 adam Exp $
+/* $Id: dcompact.c,v 1.12 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-27,7
+27,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
#include "dict-p.h"
static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
#include "dict-p.h"
static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
diff --git
a/dict/dict-p.h
b/dict/dict-p.h
index
ec76e39
..
2cb6fef
100644
(file)
--- a/
dict/dict-p.h
+++ b/
dict/dict-p.h
@@
-1,4
+1,4
@@
-/* $Id: dict-p.h,v 1.1 2004-12-08 12:23:08 adam Exp $
+/* $Id: dict-p.h,v 1.2 2004-12-13 20:51:29 adam Exp $
Copyright (C) 2004
Index Data Aps
Copyright (C) 2004
Index Data Aps
@@
-23,6
+23,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef DICT_P_H
#define DICT_P_H
#ifndef DICT_P_H
#define DICT_P_H
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/dict.h>
YAZ_BEGIN_CDECL
#include <idzebra/dict.h>
YAZ_BEGIN_CDECL
diff --git
a/include/idzebra/bfile.h
b/include/idzebra/bfile.h
index
486f868
..
e76e649
100644
(file)
--- a/
include/idzebra/bfile.h
+++ b/
include/idzebra/bfile.h
@@
-1,4
+1,4
@@
-/* $Id: bfile.h,v 1.1 2004-12-08 12:23:09 adam Exp $
+/* $Id: bfile.h,v 1.2 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-23,6
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef BFILE_H
#define BFILE_H
#ifndef BFILE_H
#define BFILE_H
+#include <yaz/yconfig.h>
#include <idzebra/version.h>
YAZ_BEGIN_CDECL
#include <idzebra/version.h>
YAZ_BEGIN_CDECL
diff --git
a/include/idzebra/data1.h
b/include/idzebra/data1.h
index
aec53b6
..
99da4bb
100644
(file)
--- a/
include/idzebra/data1.h
+++ b/
include/idzebra/data1.h
@@
-1,4
+1,4
@@
-/* $Id: data1.h,v 1.5 2004-12-10 11:56:21 heikki Exp $
+/* $Id: data1.h,v 1.6 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-31,18
+31,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <idzebra/version.h>
#include <idzebra/version.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
diff --git
a/include/idzebra/dict.h
b/include/idzebra/dict.h
index
5dc9e2b
..
e3af6ec
100644
(file)
--- a/
include/idzebra/dict.h
+++ b/
include/idzebra/dict.h
@@
-1,4
+1,4
@@
-/* $Id: dict.h,v 1.1 2004-12-08 12:23:09 adam Exp $
+/* $Id: dict.h,v 1.2 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-23,7
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef DICT_H
#define DICT_H
#ifndef DICT_H
#define DICT_H
-#include <yaz/ylog.h>
+#include <yaz/yconfig.h>
#include <idzebra/bfile.h>
YAZ_BEGIN_CDECL
#include <idzebra/bfile.h>
YAZ_BEGIN_CDECL
diff --git
a/include/zebrautl.h
b/include/zebrautl.h
index
9b1daf9
..
be845e5
100644
(file)
--- a/
include/zebrautl.h
+++ b/
include/zebrautl.h
@@
-1,4
+1,4
@@
-/* $Id: zebrautl.h,v 1.11 2004-12-10 11:56:21 heikki Exp $
+/* $Id: zebrautl.h,v 1.12 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-23,25
+23,14
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef ZEBRA_UTIL_H
#define ZEBRA_UTIL_H
#ifndef ZEBRA_UTIL_H
#define ZEBRA_UTIL_H
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <idzebra/res.h>
#include <idzebra/version.h>
/* check that we don't have all too old yaz */
#ifndef YLOG_ERRNO
#include <idzebra/res.h>
#include <idzebra/version.h>
/* check that we don't have all too old yaz */
#ifndef YLOG_ERRNO
-#error Need a modern yaz with ylog.h
+#error Need a modern yaz with YLOG_ defines
#endif
YAZ_BEGIN_CDECL
#endif
YAZ_BEGIN_CDECL
diff --git
a/index/apitest.c
b/index/apitest.c
index
b460b24
..
0f44a4f
100644
(file)
--- a/
index/apitest.c
+++ b/
index/apitest.c
@@
-1,4
+1,4
@@
-/* $Id: apitest.c,v 1.18 2004-11-19 10:26:56 heikki Exp $
+/* $Id: apitest.c,v 1.19 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
diff --git
a/index/attribute.c
b/index/attribute.c
index
5498347
..
f13833f
100644
(file)
--- a/
index/attribute.c
+++ b/
index/attribute.c
@@
-1,4
+1,4
@@
-/* $Id: attribute.c,v 1.17 2004-11-19 10:26:56 heikki Exp $
+/* $Id: attribute.c,v 1.18 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/res.h>
#include <zebrautl.h>
#include "index.h"
#include <idzebra/res.h>
#include <zebrautl.h>
#include "index.h"
diff --git
a/index/main.c
b/index/main.c
index
b8ad1fb
..
47838a1
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,4
+1,4
@@
-/* $Id: main.c,v 1.118 2004-11-19 10:27:00 heikki Exp $
+/* $Id: main.c,v 1.119 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-34,7
+34,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <sys/times.h>
#endif
#include <sys/times.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/options.h>
#include <idzebra/api.h>
#include <yaz/options.h>
#include <idzebra/api.h>
diff --git
a/index/sortidx.c
b/index/sortidx.c
index
4dd91b7
..
6954dc3
100644
(file)
--- a/
index/sortidx.c
+++ b/
index/sortidx.c
@@
-1,4
+1,4
@@
-/* $Id: sortidx.c,v 1.11 2004-12-08 12:23:09 adam Exp $
+/* $Id: sortidx.c,v 1.12 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,7
+24,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/bfile.h>
#include <sortidx.h>
#include <idzebra/bfile.h>
#include <sortidx.h>
diff --git
a/index/zebrash.c
b/index/zebrash.c
index
63a8782
..
6a2a658
100644
(file)
--- a/
index/zebrash.c
+++ b/
index/zebrash.c
@@
-1,4
+1,4
@@
-/* $Id: zebrash.c,v 1.30 2004-11-19 10:27:04 heikki Exp $
+/* $Id: zebrash.c,v 1.31 2004-12-13 20:51:30 adam Exp $
Copyright (C) 2002,2003,2004
Index Data Aps
Copyright (C) 2002,2003,2004
Index Data Aps
@@
-38,7
+38,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include <idzebra/api.h>
#endif
#include <idzebra/api.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <yaz/sortspec.h>
#include <yaz/options.h>
#include <yaz/proto.h>
#include <yaz/sortspec.h>
#include <yaz/options.h>
diff --git
a/index/zserver.c
b/index/zserver.c
index
3537873
..
ad2aa5a
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,4
+1,4
@@
-/* $Id: zserver.c,v 1.124 2004-11-29 21:45:11 adam Exp $
+/* $Id: zserver.c,v 1.125 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-32,7
+32,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include <errno.h>
#endif
#include <errno.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
diff --git
a/isamb/isamb.c
b/isamb/isamb.c
index
e4b87ca
..
d72a505
100644
(file)
--- a/
isamb/isamb.c
+++ b/
isamb/isamb.c
@@
-1,4
+1,4
@@
-/* $Id: isamb.c,v 1.61 2004-12-08 14:02:36 adam Exp $
+/* $Id: isamb.c,v 1.62 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-21,8
+21,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
#include <string.h>
*/
#include <string.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <idzebra/isamb.h>
#include <assert.h>
#include <idzebra/isamb.h>
#include <assert.h>
diff --git
a/isamb/tstisamb.c
b/isamb/tstisamb.c
index
1eb402c
..
67e3336
100644
(file)
--- a/
isamb/tstisamb.c
+++ b/
isamb/tstisamb.c
@@
-1,4
+1,4
@@
-/* $Id: tstisamb.c,v 1.12 2004-12-08 14:02:37 adam Exp $
+/* $Id: tstisamb.c,v 1.13 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-21,8
+21,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
#include <string.h>
*/
#include <string.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <idzebra/isamb.h>
#include <assert.h>
#include <idzebra/isamb.h>
#include <assert.h>
diff --git
a/isamc/isamc.c
b/isamc/isamc.c
index
534037f
..
c1af1f0
100644
(file)
--- a/
isamc/isamc.c
+++ b/
isamc/isamc.c
@@
-1,4
+1,4
@@
-/* $Id: isamc.c,v 1.27 2004-11-19 10:27:09 heikki Exp $
+/* $Id: isamc.c,v 1.28 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-29,7
+29,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include "isamc-p.h"
static void flush_block (ISAMC is, int cat);
#include "isamc-p.h"
static void flush_block (ISAMC is, int cat);
diff --git
a/isamc/merge.c
b/isamc/merge.c
index
e8d9247
..
09a3e06
100644
(file)
--- a/
isamc/merge.c
+++ b/
isamc/merge.c
@@
-1,4
+1,4
@@
-/* $Id: merge.c,v 1.27 2004-11-19 10:27:09 heikki Exp $
+/* $Id: merge.c,v 1.28 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include "isamc-p.h"
struct isc_merge_block {
#include "isamc-p.h"
struct isc_merge_block {
diff --git
a/isams/isams.c
b/isams/isams.c
index
08d0b0f
..
c0ff3ef
100644
(file)
--- a/
isams/isams.c
+++ b/
isams/isams.c
@@
-1,4
+1,4
@@
-/* $Id: isams.c,v 1.9 2004-12-08 14:02:37 adam Exp $
+/* $Id: isams.c,v 1.10 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-26,7
+26,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/isams.h>
typedef struct {
#include <idzebra/isams.h>
typedef struct {
diff --git
a/perl/zebra_perl.c
b/perl/zebra_perl.c
index
147d2ac
..
aa18fb8
100644
(file)
--- a/
perl/zebra_perl.c
+++ b/
perl/zebra_perl.c
@@
-4,7
+4,7
@@
#include <yaz/yaz-util.h>
#include <yaz/proto.h>
#include <yaz/yaz-util.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/cql.h>
#include <yaz/pquery.h>
#include <yaz/cql.h>
#include <yaz/pquery.h>
diff --git
a/recctrl/danbibr.c
b/recctrl/danbibr.c
index
f7478ba
..
87da05f
100644
(file)
--- a/
recctrl/danbibr.c
+++ b/
recctrl/danbibr.c
@@
-1,4
+1,4
@@
-/* $Id: danbibr.c,v 1.7 2004-11-19 10:27:12 heikki Exp $
+/* $Id: danbibr.c,v 1.8 2004-12-13 20:51:32 adam Exp $
Copyright (C) 2004
Index Data Aps
Copyright (C) 2004
Index Data Aps
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
#include <idzebra/recgrs.h>
diff --git
a/recctrl/inline.c
b/recctrl/inline.c
index
96fd79d
..
be1a1de
100644
(file)
--- a/
recctrl/inline.c
+++ b/
recctrl/inline.c
@@
-1,22
+1,10
@@
/*
/*
- $Id: inline.c,v 1.4 2004-12-10 11:56:22 heikki Exp $
+ $Id: inline.c,v 1.5 2004-12-13 20:51:32 adam Exp $
*/
#include <stdio.h>
#include <string.h>
#include <ctype.h>
*/
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
-
+#include <yaz/yaz-util.h>
#include "inline.h"
static void inline_destroy_subfield_recursive(inline_subfield *p);
#include "inline.h"
static void inline_destroy_subfield_recursive(inline_subfield *p);
diff --git
a/recctrl/marcomp.c
b/recctrl/marcomp.c
index
fa898ba
..
d529d98
100644
(file)
--- a/
recctrl/marcomp.c
+++ b/
recctrl/marcomp.c
@@
-1,5
+1,5
@@
/*
/*
- $Id: marcomp.c,v 1.3 2004-12-10 11:56:22 heikki Exp $
+ $Id: marcomp.c,v 1.4 2004-12-13 20:51:32 adam Exp $
marcomp.c - compiler of MARC statements.
*/
marcomp.c - compiler of MARC statements.
*/
@@
-9,19
+9,7
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include "marcomp.h"
#include "marcomp.h"
diff --git
a/recctrl/marcread.c
b/recctrl/marcread.c
index
a0fdcac
..
48d7437
100644
(file)
--- a/
recctrl/marcread.c
+++ b/
recctrl/marcread.c
@@
-1,4
+1,4
@@
-/* $Id: marcread.c,v 1.27 2004-11-19 10:27:12 heikki Exp $
+/* $Id: marcread.c,v 1.28 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-24,7
+24,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
#include <assert.h>
-#include <yaz/ylog.h>
#include <yaz/yaz-util.h>
#include <yaz/marcdisp.h>
#include <idzebra/recgrs.h>
#include <yaz/yaz-util.h>
#include <yaz/marcdisp.h>
#include <idzebra/recgrs.h>
diff --git
a/recctrl/recgrs.c
b/recctrl/recgrs.c
index
b1e714d
..
1c34c2e
100644
(file)
--- a/
recctrl/recgrs.c
+++ b/
recctrl/recgrs.c
@@
-1,4
+1,4
@@
-/* $Id: recgrs.c,v 1.94 2004-11-29 21:45:12 adam Exp $
+/* $Id: recgrs.c,v 1.95 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-28,7
+28,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <dlfcn.h>
#endif
#include <dlfcn.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <d1_absyn.h>
#include <yaz/oid.h>
#include <d1_absyn.h>
diff --git
a/recctrl/sgmlread.c
b/recctrl/sgmlread.c
index
ba9cbb1
..
3f82a1b
100644
(file)
--- a/
recctrl/sgmlread.c
+++ b/
recctrl/sgmlread.c
@@
-1,4
+1,4
@@
-/* $Id: sgmlread.c,v 1.14 2004-11-19 10:27:13 heikki Exp $
+/* $Id: sgmlread.c,v 1.15 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-22,7
+22,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <assert.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
#include <idzebra/recgrs.h>
diff --git
a/recctrl/xmlread.c
b/recctrl/xmlread.c
index
aef219b
..
52bb098
100644
(file)
--- a/
recctrl/xmlread.c
+++ b/
recctrl/xmlread.c
@@
-1,4
+1,4
@@
-/* $Id: xmlread.c,v 1.16 2004-11-19 10:27:13 heikki Exp $
+/* $Id: xmlread.c,v 1.17 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-30,12
+30,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <iconv.h>
#endif
#include <iconv.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
#include <idzebra/recgrs.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <expat.h>
#include <expat.h>
diff --git
a/test/Makefile.am
b/test/Makefile.am
index
cff5790
..
9bfea70
100644
(file)
--- a/
test/Makefile.am
+++ b/
test/Makefile.am
@@
-1,4
+1,4
@@
SUBDIRS=codec api xpath gils malxml config usmarc dmoz sort sort2 xelm cddb \
SUBDIRS=codec api xpath gils malxml config usmarc dmoz sort sort2 xelm cddb \
- rusmarc zsh marcxml charmap mbox
+ rusmarc zsh marcxml charmap mbox espec
diff --git
a/test/api/testlib.c
b/test/api/testlib.c
index
3cc35df
..
8538b3b
100644
(file)
--- a/
test/api/testlib.c
+++ b/
test/api/testlib.c
@@
-1,4
+1,4
@@
-/* $Id: testlib.c,v 1.7 2004-12-02 14:05:04 adam Exp $
+/* $Id: testlib.c,v 1.8 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-23,6
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/** testlib - utilities for the api tests */
#include <assert.h>
/** testlib - utilities for the api tests */
#include <assert.h>
+#include <yaz/log.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
#include "testlib.h"
#include <yaz/pquery.h>
#include <idzebra/api.h>
#include "testlib.h"
diff --git
a/test/api/testlib.h
b/test/api/testlib.h
index
3ce9288
..
b290f84
100644
(file)
--- a/
test/api/testlib.h
+++ b/
test/api/testlib.h
@@
-1,4
+1,4
@@
-/* $Id: testlib.h,v 1.5 2004-11-29 21:55:28 adam Exp $
+/* $Id: testlib.h,v 1.6 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-23,7
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/** testlib - utilities for the api tests */
#include <stdlib.h>
/** testlib - utilities for the api tests */
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/yconfig.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
diff --git
a/util/charmap.c
b/util/charmap.c
index
6161a43
..
48fdec9
100644
(file)
--- a/
util/charmap.c
+++ b/
util/charmap.c
@@
-1,4
+1,4
@@
-/* $Id: charmap.c,v 1.32 2004-12-10 11:56:23 heikki Exp $
+/* $Id: charmap.c,v 1.33 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-35,19
+35,7
@@
typedef unsigned ucs4_t;
#include <charmap.h>
#include <charmap.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
-
+#include <yaz/yaz-util.h>
#define CHR_MAXSTR 1024
#define CHR_MAXEQUIV 32
#define CHR_MAXSTR 1024
#define CHR_MAXEQUIV 32
diff --git
a/util/passwddb.c
b/util/passwddb.c
index
445d79f
..
f8ea25c
100644
(file)
--- a/
util/passwddb.c
+++ b/
util/passwddb.c
@@
-1,4
+1,4
@@
-/* $Id: passwddb.c,v 1.8 2004-11-19 10:27:17 heikki Exp $
+/* $Id: passwddb.c,v 1.9 2004-12-13 20:51:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-36,7
+36,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <crypt.h>
#endif
#include <crypt.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <passwddb.h>
#include <yaz/xmalloc.h>
#include <passwddb.h>
diff --git
a/util/zebramap.c
b/util/zebramap.c
index
c73e78a
..
df53aa8
100644
(file)
--- a/
util/zebramap.c
+++ b/
util/zebramap.c
@@
-1,4
+1,4
@@
-/* $Id: zebramap.c,v 1.36 2004-12-10 11:56:23 heikki Exp $
+/* $Id: zebramap.c,v 1.37 2004-12-13 20:51:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-26,18
+26,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <ctype.h>
#include <charmap.h>
#include <ctype.h>
#include <charmap.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <idzebra/zebramap.h>
#include <idzebra/zebramap.h>
diff --git
a/yaz.m4
b/yaz.m4
index
f8c360e
..
9626319
100644
(file)
--- a/
yaz.m4
+++ b/
yaz.m4
@@
-129,6
+129,9
@@
AC_DEFUN([YAZ_INIT],
if test "$have_yaz_version" -lt "$req_yaz_version"; then
AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
fi
if test "$have_yaz_version" -lt "$req_yaz_version"; then
AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
fi
+ if test "$req_yaz_version" -gt "2000028"; then
+ YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
+ fi
fi
fi
])
fi
fi
])