From 491fb0058392b83d1e44eaa7494e827f3530f3dd Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 13 Dec 2004 20:50:54 +0000
Subject: [PATCH] using yaz/log.h again

---
 src/yaz-cql2rpn.cpp          |    4 ++--
 src/yaz-ir-assoc.cpp         |    4 ++--
 src/yaz-my-client.cpp        |    6 +++---
 src/yaz-my-server.cpp        |    4 ++--
 src/yaz-pdu-assoc-thread.cpp |    6 +++---
 src/yaz-pdu-assoc.cpp        |    6 +++---
 src/yaz-socket-manager.cpp   |    4 ++--
 src/yaz-z-assoc.cpp          |    4 ++--
 src/yaz-z-cache.cpp          |    4 ++--
 src/yaz-z-server-ill.cpp     |    6 +++---
 src/yaz-z-server-sr.cpp      |    6 +++---
 src/yaz-z-server-update.cpp  |    6 +++---
 src/yaz-z-server.cpp         |    6 +++---
 zlint/test-init-01.cpp       |    4 ++--
 zlint/test-init-02.cpp       |    4 ++--
 zlint/test-init-03.cpp       |    4 ++--
 zlint/test-init-04.cpp       |    4 ++--
 zlint/test-init-05.cpp       |    4 ++--
 zlint/test-init-06.cpp       |    4 ++--
 zlint/test-init-07.cpp       |    4 ++--
 zlint/test-init-08.cpp       |    4 ++--
 zlint/test-scan-01.cpp       |    4 ++--
 zlint/test-search-01.cpp     |    4 ++--
 zlint/zlint.cpp              |    4 ++--
 24 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp
index d97f9f0..f8ca22b 100644
--- a/src/yaz-cql2rpn.cpp
+++ b/src/yaz-cql2rpn.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-cql2rpn.cpp,v 1.5 2004-11-30 21:10:30 adam Exp $
+ * $Id: yaz-cql2rpn.cpp,v 1.6 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/pquery.h>
 #include <yaz++/cql2rpn.h>
 
diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 9ba878f..edb8a1b 100644
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -2,12 +2,12 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-ir-assoc.cpp,v 1.22 2004-11-30 21:10:30 adam Exp $
+ * $Id: yaz-ir-assoc.cpp,v 1.23 2004-12-13 20:50:54 adam Exp $
  */
 
 #include <assert.h>
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/ir-assoc.h>
 
 Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index 8d7a51e..a42f928 100644
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-client.cpp,v 1.16 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-my-client.cpp,v 1.17 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/options.h>
 #include <yaz/diagbib1.h>
 #include <yaz/marcdisp.h>
diff --git a/src/yaz-my-server.cpp b/src/yaz-my-server.cpp
index 214a3e4..4d145ab 100644
--- a/src/yaz-my-server.cpp
+++ b/src/yaz-my-server.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-server.cpp,v 1.13 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-my-server.cpp,v 1.14 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/options.h>
 #include <yaz++/z-server.h>
 #include <yaz++/pdu-assoc.h>
diff --git a/src/yaz-pdu-assoc-thread.cpp b/src/yaz-pdu-assoc-thread.cpp
index e526dfc..4a6b921 100644
--- a/src/yaz-pdu-assoc-thread.cpp
+++ b/src/yaz-pdu-assoc-thread.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-pdu-assoc-thread.cpp,v 1.7 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-pdu-assoc-thread.cpp,v 1.8 2004-12-13 20:50:54 adam Exp $
  */
 
 #ifdef WIN32
@@ -23,7 +23,7 @@
 #endif
 
 #include <errno.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/tcpip.h>
 
 #include <yaz++/pdu-assoc.h>
diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index d888cef..ab47de3 100644
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-pdu-assoc.cpp,v 1.38 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-pdu-assoc.cpp,v 1.39 2004-12-13 20:50:54 adam Exp $
  */
 
 #include <assert.h>
 #include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/tcpip.h>
 
 #include <yaz++/pdu-assoc.h>
diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 11d34e9..2cc87fa 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.29 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.30 2004-12-13 20:50:54 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/socket-manager.h>
 
 Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 0e669dc..cc43a6d 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-assoc.cpp,v 1.34 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-assoc.cpp,v 1.35 2004-12-13 20:50:54 adam Exp $
  */
 
 #include <assert.h>
 #include <signal.h>
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-assoc.h>
 #include <yaz/otherinfo.h>
 
diff --git a/src/yaz-z-cache.cpp b/src/yaz-z-cache.cpp
index 564000e..dc58b25 100644
--- a/src/yaz-z-cache.cpp
+++ b/src/yaz-z-cache.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-cache.cpp,v 1.10 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-cache.cpp,v 1.11 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/proto.h>
 #include <yaz++/record-cache.h>
 
diff --git a/src/yaz-z-server-ill.cpp b/src/yaz-z-server-ill.cpp
index 5daf0ca..4a3a0a7 100644
--- a/src/yaz-z-server-ill.cpp
+++ b/src/yaz-z-server-ill.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server-ill.cpp,v 1.10 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-server-ill.cpp,v 1.11 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-server.h>
 
 int Yaz_Facility_ILL::init(Yaz_Z_Server *s, Z_InitRequest *initRequest,
diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp
index 396757f..caa0813 100644
--- a/src/yaz-z-server-sr.cpp
+++ b/src/yaz-z-server-sr.cpp
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server-sr.cpp,v 1.7 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-server-sr.cpp,v 1.8 2004-12-13 20:50:54 adam Exp $
  *
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-server.h>
 
 Z_Records *Yaz_Facility_Retrieval::pack_records (Yaz_Z_Server *s,
diff --git a/src/yaz-z-server-update.cpp b/src/yaz-z-server-update.cpp
index 0b1d70e..80df0d4 100644
--- a/src/yaz-z-server-update.cpp
+++ b/src/yaz-z-server-update.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2000-2003, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server-update.cpp,v 1.6 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-server-update.cpp,v 1.7 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-server.h>
 
 int Yaz_Facility_Update::init(Yaz_Z_Server *s, Z_InitRequest *initRequest,
diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index b2fac81..8e475e2 100644
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2000-2003, Index Data.
+ * Copyright (c) 2000-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.cpp,v 1.19 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-z-server.cpp,v 1.20 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz++/z-server.h>
 
 Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable)
diff --git a/zlint/test-init-01.cpp b/zlint/test-init-01.cpp
index 1dd4200..092baf1 100644
--- a/zlint/test-init-01.cpp
+++ b/zlint/test-init-01.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-01.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-01.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-02.cpp b/zlint/test-init-02.cpp
index 849be66..97b7348 100644
--- a/zlint/test-init-02.cpp
+++ b/zlint/test-init-02.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-02.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-02.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-03.cpp b/zlint/test-init-03.cpp
index 199229f..64f8ae6 100644
--- a/zlint/test-init-03.cpp
+++ b/zlint/test-init-03.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-03.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-03.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-04.cpp b/zlint/test-init-04.cpp
index 6b2912b..14e9ac7 100644
--- a/zlint/test-init-04.cpp
+++ b/zlint/test-init-04.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-04.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-04.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-05.cpp b/zlint/test-init-05.cpp
index a9c5b5f..87433f9 100644
--- a/zlint/test-init-05.cpp
+++ b/zlint/test-init-05.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-05.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-05.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-06.cpp b/zlint/test-init-06.cpp
index 641b1f3..2d40f35 100644
--- a/zlint/test-init-06.cpp
+++ b/zlint/test-init-06.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-06.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-06.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
diff --git a/zlint/test-init-07.cpp b/zlint/test-init-07.cpp
index 4809f21..e586c92 100644
--- a/zlint/test-init-07.cpp
+++ b/zlint/test-init-07.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-07.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-07.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/charneg.h>
 #include <yaz/otherinfo.h>
 
diff --git a/zlint/test-init-08.cpp b/zlint/test-init-08.cpp
index e3b187c..43a9010 100644
--- a/zlint/test-init-08.cpp
+++ b/zlint/test-init-08.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-init-08.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-init-08.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/charneg.h>
 #include <yaz/otherinfo.h>
 
diff --git a/zlint/test-scan-01.cpp b/zlint/test-scan-01.cpp
index 0a6a001..dd113b0 100644
--- a/zlint/test-scan-01.cpp
+++ b/zlint/test-scan-01.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-scan-01.cpp,v 1.2 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-scan-01.cpp,v 1.3 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/pquery.h>
 
 #include <zlint.h>
diff --git a/zlint/test-search-01.cpp b/zlint/test-search-01.cpp
index 5bbe658..d99a22f 100644
--- a/zlint/test-search-01.cpp
+++ b/zlint/test-search-01.cpp
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: test-search-01.cpp,v 1.3 2004-11-30 21:10:31 adam Exp $
+ * $Id: test-search-01.cpp,v 1.4 2004-12-13 20:50:54 adam Exp $
  */
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>
 
diff --git a/zlint/zlint.cpp b/zlint/zlint.cpp
index 45c9b23..3987a21 100644
--- a/zlint/zlint.cpp
+++ b/zlint/zlint.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: zlint.cpp,v 1.7 2004-11-30 21:10:31 adam Exp $
+ * $Id: zlint.cpp,v 1.8 2004-12-13 20:50:54 adam Exp $
  */
 
 #include <stdio.h>
@@ -12,7 +12,7 @@
 #include <yaz/options.h>
 #include <yaz/otherinfo.h>
 #include <yaz/charneg.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #include <zlint.h>
 
-- 
1.7.10.4