/*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-z-assoc.cpp,v 1.29 2003-10-20 18:31:44 adam Exp $
+ * $Id: yaz-z-assoc.cpp,v 1.37 2005-06-08 13:28:06 adam Exp $
*/
#include <assert.h>
#include <yaz++/z-assoc.h>
#include <yaz/otherinfo.h>
-int Yaz_Z_Assoc::yaz_init_func()
+using namespace yazpp_1;
+
+int Z_Assoc::yaz_init_func()
{
#ifndef WIN32
signal (SIGPIPE, SIG_IGN);
return 1;
}
-int Yaz_Z_Assoc::yaz_init_flag = Yaz_Z_Assoc::yaz_init_func();
+int Z_Assoc::yaz_init_flag = Z_Assoc::yaz_init_func();
-Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
+Z_Assoc::Z_Assoc(IPDU_Observable *the_PDU_Observable)
{
m_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;
m_APDU_yazlog = 0;
}
-void Yaz_Z_Assoc::set_APDU_log(const char *fname)
+void Z_Assoc::set_APDU_log(const char *fname)
{
if (m_APDU_file && m_APDU_file != stderr)
{
}
}
-int Yaz_Z_Assoc::set_APDU_yazlog(int v)
+int Z_Assoc::set_APDU_yazlog(int v)
{
int old = m_APDU_yazlog;
m_APDU_yazlog = v;
return old;
}
-const char *Yaz_Z_Assoc::get_APDU_log()
+const char *Z_Assoc::get_APDU_log()
{
return m_APDU_fname;
}
-Yaz_Z_Assoc::~Yaz_Z_Assoc()
+Z_Assoc::~Z_Assoc()
{
m_PDU_Observable->destroy();
delete m_PDU_Observable;
delete [] m_hostname;
}
-void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
+void Z_Assoc::recv_PDU(const char *buf, int len)
{
yaz_log (m_log, "recv_PDU len=%d", len);
- Z_APDU *apdu = decode_Z_PDU (buf, len);
+ Z_GDU *apdu = decode_GDU (buf, len);
if (apdu)
{
- recv_Z_PDU (apdu, len);
+ recv_GDU (apdu, len);
}
else
{
}
}
-Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type)
+Z_APDU *Z_Assoc::create_Z_PDU(int type)
{
Z_APDU *apdu = zget_APDU(m_odr_out, type);
if (apdu->which == Z_APDU_initRequest)
return apdu;
}
-Z_ReferenceId **Yaz_Z_Assoc::get_referenceIdP(Z_APDU *apdu)
+Z_ReferenceId **Z_Assoc::get_referenceIdP(Z_APDU *apdu)
{
switch (apdu->which)
{
return 0;
}
-void Yaz_Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
+void Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
{
Z_ReferenceId **id_from = get_referenceIdP(from);
Z_ReferenceId **id_to = get_referenceIdP(to);
*id_to = 0;
}
-int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu, int *plen)
+int Z_Assoc::send_Z_PDU(Z_APDU *apdu, int *plen)
+{
+ Z_GDU *gdu = (Z_GDU*) odr_malloc(odr_encode(), sizeof(*gdu));
+ gdu->which = Z_GDU_Z3950;
+ gdu->u.z3950 = apdu;
+ return send_GDU(gdu, plen);
+}
+
+int Z_Assoc::send_GDU(Z_GDU *apdu, int *plen)
{
char *buf;
int len;
- if (encode_Z_PDU(apdu, &buf, &len) > 0)
+ if (encode_GDU(apdu, &buf, &len) > 0)
{
if (plen)
*plen = len;
return -1;
}
-Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
+Z_GDU *Z_Assoc::decode_GDU(const char *buf, int len)
{
- Z_APDU *apdu;
+ Z_GDU *apdu;
odr_reset (m_odr_in);
odr_setbuf (m_odr_in, (char*) buf, len, 0);
- if (!z_APDU(m_odr_in, &apdu, 0, 0))
+ if (!z_GDU(m_odr_in, &apdu, 0, 0))
{
- yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
- odr_errmsg(odr_geterror(m_odr_in)),
- odr_offset(m_odr_in));
- yaz_log(LOG_LOG, "PDU dump:");
+ const char *element = odr_getelement(m_odr_in);
+ 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(YLOG_LOG, "PDU dump:");
odr_dumpBER(yaz_log_file(), buf, len);
return 0;
}
FILE *save = m_APDU_file;
odr_setprint(m_odr_print, yaz_log_file());
- z_APDU(m_odr_print, &apdu, 0, "decode");
+ z_GDU(m_odr_print, &apdu, 0, "decode");
m_APDU_file = save;
+ odr_setprint(m_odr_print, save);
}
if (m_APDU_file)
{
- z_APDU(m_odr_print, &apdu, 0, "decode");
+ z_GDU(m_odr_print, &apdu, 0, "decode");
fflush(m_APDU_file);
}
return apdu;
}
}
-int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
+int Z_Assoc::encode_GDU(Z_GDU *apdu, char **buf, int *len)
{
- if (m_APDU_yazlog)
+ const char *element = 0;
+ int r = z_GDU(m_odr_out, &apdu, 0, 0);
+
+ if (!r) // decoding failed. Get the failed element
+ element = odr_getelement(m_odr_out);
+
+ if (m_APDU_yazlog || !r)
{
+ if (!r)
+ yaz_log (YLOG_LOG, "PDU encode failed. Element %s",
+ element ? element : "unknown");
FILE *save = m_APDU_file;
- odr_setprint(m_odr_print, yaz_log_file()); // use YAZ log FILE
- z_APDU(m_odr_print, &apdu, 0, "encode");
+ FILE *yazf = yaz_log_file();
+ odr_setprint(m_odr_print, yazf); // use YAZ log FILE
+ z_GDU(m_odr_print, &apdu, 0, "encode");
m_APDU_file = save;
+ odr_setprint(m_odr_print, save);
}
if (m_APDU_file)
{
- z_APDU(m_odr_print, &apdu, 0, "encode");
+ if (!r)
+ fprintf (m_APDU_file, "PDU encode failed. Element %s",
+ element ? element : "unknown");
+ z_GDU(m_odr_print, &apdu, 0, "encode");
fflush(m_APDU_file);
}
- if (!z_APDU(m_odr_out, &apdu, 0, 0))
- {
- if (m_APDU_file)
- fprintf (m_APDU_file, "PDU encode failed (above)");
- yaz_log (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
+ if (!r) // encoding failed
return -1;
- }
*buf = odr_getbuf (m_odr_out, len, 0);
odr_reset (m_odr_out);
return *len;
}
-const char *Yaz_Z_Assoc::get_hostname()
+const char *Z_Assoc::get_hostname()
{
return m_hostname;
}
-int Yaz_Z_Assoc::client(const char *addr)
+int Z_Assoc::client(const char *addr)
{
delete [] m_hostname;
m_hostname = new char[strlen(addr)+1];
return m_PDU_Observable->connect (this, addr);
}
-void Yaz_Z_Assoc::close()
+void Z_Assoc::close()
{
m_PDU_Observable->close ();
}
-void Yaz_Z_Assoc::server(const char *addr)
+int Z_Assoc::server(const char *addr)
{
delete [] m_hostname;
m_hostname = new char[strlen(addr)+1];
strcpy (m_hostname, addr);
- m_PDU_Observable->listen (this, addr);
+ return m_PDU_Observable->listen (this, addr);
}
-ODR Yaz_Z_Assoc::odr_encode()
+ODR Z_Assoc::odr_encode()
{
return m_odr_out;
}
-ODR Yaz_Z_Assoc::odr_decode()
+ODR Z_Assoc::odr_decode()
{
return m_odr_in;
}
-ODR Yaz_Z_Assoc::odr_print()
+ODR Z_Assoc::odr_print()
{
return m_odr_print;
}
-void Yaz_Z_Assoc::timeout(int timeout)
+void Z_Assoc::timeout(int timeout)
{
m_PDU_Observable->idleTime(timeout);
}
-void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
+void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
{
switch (apdu->which)
{
}
}
-void Yaz_Z_Assoc::set_otherInformationString (
+void Z_Assoc::set_otherInformationString (
Z_APDU *apdu,
int oidval, int categoryValue,
const char *str)
set_otherInformationString(otherInformation, oidval, categoryValue, str);
}
-void Yaz_Z_Assoc::set_otherInformationString (
+void Z_Assoc::set_otherInformationString (
Z_OtherInformation **otherInformation,
int oidval, int categoryValue,
const char *str)
set_otherInformationString(otherInformation, oid, categoryValue, str);
}
-void Yaz_Z_Assoc::set_otherInformationString (
+void Z_Assoc::set_otherInformationString (
Z_OtherInformation **otherInformation,
int *oid, int categoryValue, const char *str)
{
oi->information.characterInfo = odr_strdup (odr_encode(), str);
}
-Z_OtherInformationUnit *Yaz_Z_Assoc::update_otherInformation (
+Z_OtherInformationUnit *Z_Assoc::update_otherInformation (
Z_OtherInformation **otherInformationP, int createFlag,
int *oid, int categoryValue, int deleteFlag)
{
oid, categoryValue, deleteFlag);
}
-Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str)
+Z_ReferenceId* Z_Assoc::getRefID(char* str)
{
Z_ReferenceId* id = NULL;
projects / yazpp-moved-to-github.git / blobdiff