X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Fyaz-z-assoc.cpp;h=cc43a6d6926cde3942dada2866568f42f3e62998;hb=29d5f0cb70a5a61924e3b729f6ce5998cd6485ab;hp=8413ea8a32bb0a7cb679d392ab972bfaa9a1a2ba;hpb=4ffb5c5f0c0c64799a89f7961fd553ae8ae4854b;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index 8413ea8..cc43a6d 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-assoc.cpp,v 1.33 2004-01-24 21:33:27 adam Exp $ + * $Id: yaz-z-assoc.cpp,v 1.35 2004-12-13 20:50:54 adam Exp $ */ #include @@ -28,7 +28,7 @@ Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable) m_odr_in = odr_createmem (ODR_DECODE); m_odr_out = odr_createmem (ODR_ENCODE); m_odr_print = odr_createmem (ODR_PRINT); - m_log = LOG_DEBUG; + m_log = YLOG_DEBUG; m_APDU_file = 0; m_APDU_fname = 0; m_hostname = 0; @@ -211,11 +211,11 @@ Z_GDU *Yaz_Z_Assoc::decode_GDU(const char *buf, int len) if (!z_GDU(m_odr_in, &apdu, 0, 0)) { const char *element = odr_getelement(m_odr_in); - yaz_log(LOG_LOG, "PDU decode failed '%s' near byte %d. Element %s", + yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %d. Element %s", odr_errmsg(odr_geterror(m_odr_in)), odr_offset(m_odr_in), element ? element : "unknown"); - yaz_log(LOG_LOG, "PDU dump:"); + yaz_log(YLOG_LOG, "PDU dump:"); odr_dumpBER(yaz_log_file(), buf, len); return 0; } @@ -250,7 +250,7 @@ int Yaz_Z_Assoc::encode_GDU(Z_GDU *apdu, char **buf, int *len) if (m_APDU_yazlog || !r) { if (!r) - yaz_log (LOG_LOG, "PDU encode failed. Element %s", + yaz_log (YLOG_LOG, "PDU encode failed. Element %s", element ? element : "unknown"); FILE *save = m_APDU_file; FILE *yazf = yaz_log_file();