X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=c3ffcf71468ab2c1756ec0de2b34e5e6dc802369;hb=87be6c609c22d9620c781b95ab74298b63694055;hp=c9b4307617a41c330dfa7e43f2c23c287b504615;hpb=5c45ffbb2b430a6f41277c303a5e9b94242dab96;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index c9b4307..c3ffcf7 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -4,7 +4,27 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: yaz-z-assoc.cpp,v $ - * Revision 1.3 1999-04-21 12:09:01 adam + * Revision 1.8 2000-08-07 14:19:59 adam + * Fixed serious bug regarding timeouts. Improved logging for proxy. + * + * Revision 1.7 2000/05/10 11:36:58 ian + * Added default parameters for refid to request functions. + * Added default parameter for result set name to search and present request. + * Commented out forced logging of PDU contents. + * Added send_deleteResultSetRequest + * + * Revision 1.6 1999/12/06 13:52:45 adam + * Modified for new location of YAZ header files. Experimental threaded + * operation. + * + * Revision 1.5 1999/11/10 10:02:34 adam + * Work on proxy. + * + * Revision 1.4 1999/09/13 12:53:44 adam + * Proxy removes OtherInfo Proxy Address and Session ID. Other + * Otherinfo remains untouched. + * + * Revision 1.3 1999/04/21 12:09:01 adam * Many improvements. Modified to proxy server to work with "sessions" * based on cookies. * @@ -19,14 +39,13 @@ #include -#include +#include #include +#include int Yaz_Z_Assoc::yaz_init_func() { - logf (LOG_LOG, "nmem_init"); nmem_init(); - logf (LOG_LOG, "done"); return 1; } @@ -38,6 +57,38 @@ 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_APDU_file = 0; + m_APDU_fname = 0; + m_hostname = 0; +} + +void Yaz_Z_Assoc::set_APDU_log(const char *fname) +{ + if (m_APDU_file && m_APDU_file != stderr) + fclose (m_APDU_file); + m_APDU_file = 0; + delete [] m_APDU_fname; + m_APDU_fname = 0; + + if (fname) + { + m_APDU_fname = new char[strlen(fname)+1]; + strcpy (m_APDU_fname, fname); + } + if (fname) + { + if (*fname) + m_APDU_file = fopen (fname, "a"); + else + m_APDU_file = stderr; + odr_setprint(m_odr_print, m_APDU_file); + } +} + +const char *Yaz_Z_Assoc::get_APDU_log() +{ + return m_APDU_fname; } Yaz_Z_Assoc::~Yaz_Z_Assoc() @@ -47,11 +98,15 @@ Yaz_Z_Assoc::~Yaz_Z_Assoc() odr_destroy (m_odr_print); odr_destroy (m_odr_out); odr_destroy (m_odr_in); + delete [] m_APDU_fname; + if (m_APDU_file && m_APDU_file != stderr) + fclose (m_APDU_file); + delete [] m_hostname; } void Yaz_Z_Assoc::recv_PDU(const char *buf, int len) { - logf (LOG_LOG, "recv_PDU len=%d", len); + logf (m_log, "recv_PDU len=%d", len); Z_APDU *apdu = decode_Z_PDU (buf, len); if (apdu) { @@ -77,7 +132,6 @@ int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu) { char *buf; int len; - logf (LOG_LOG, "Yaz_Z_Assoc:send_Z_PDU"); if (encode_Z_PDU(apdu, &buf, &len) > 0) return m_PDU_Observable->send_PDU(buf, len); return -1; @@ -101,7 +155,8 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len) } else { - z_APDU(m_odr_print, &apdu, 0, "decode"); + if (m_APDU_file) + z_APDU(m_odr_print, &apdu, 0, "decode"); return apdu; } } @@ -113,29 +168,23 @@ int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len) logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed"); return -1; } - z_APDU(m_odr_print, &apdu, 0, "encode"); + if (m_APDU_file) + z_APDU(m_odr_print, &apdu, 0, "encode"); *buf = odr_getbuf (m_odr_out, len, 0); odr_reset (m_odr_out); return *len; } -void Yaz_Z_Assoc::connectNotify() -{ - logf (LOG_LOG, "connectNotify"); -} - -void Yaz_Z_Assoc::failNotify() -{ - logf (LOG_LOG, "failNotify"); -} - -void Yaz_Z_Assoc::timeoutNotify() +const char *Yaz_Z_Assoc::get_hostname() { - logf (LOG_LOG, "timeoutNotify"); + return m_hostname; } void Yaz_Z_Assoc::client(const char *addr) { + delete [] m_hostname; + m_hostname = new char[strlen(addr)+1]; + strcpy (m_hostname, addr); m_PDU_Observable->connect (this, addr); } @@ -146,6 +195,9 @@ void Yaz_Z_Assoc::close() void Yaz_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); } @@ -237,11 +289,10 @@ void Yaz_Z_Assoc::set_otherInformationString ( void Yaz_Z_Assoc::set_otherInformationString ( Z_OtherInformation **otherInformation, - int *oid, int categoryValue, - const char *str) + int *oid, int categoryValue, const char *str) { Z_OtherInformationUnit *oi = - update_otherInformation(otherInformation, 1, oid, categoryValue); + update_otherInformation(otherInformation, 1, oid, categoryValue, 0); if (!oi) return; oi->information.characterInfo = odr_strdup (odr_encode(), str); @@ -249,63 +300,24 @@ void Yaz_Z_Assoc::set_otherInformationString ( Z_OtherInformationUnit *Yaz_Z_Assoc::update_otherInformation ( Z_OtherInformation **otherInformationP, int createFlag, - int *oid, int categoryValue) + int *oid, int categoryValue, int deleteFlag) { - int i; - Z_OtherInformation *otherInformation = *otherInformationP; - if (!otherInformation) - { - if (!createFlag) - return 0; - otherInformation = *otherInformationP = (Z_OtherInformation *) - odr_malloc (odr_encode(), sizeof(*otherInformation)); - otherInformation->num_elements = 0; - otherInformation->list = (Z_OtherInformationUnit **) - odr_malloc (odr_encode(), 8*sizeof(*otherInformation)); - for (i = 0; i<8; i++) - otherInformation->list[i] = 0; - } - logf (LOG_LOG, "Yaz_Z_Assoc::update_otherInformation num=%d", - otherInformation->num_elements); - for (i = 0; inum_elements; i++) - { - assert (otherInformation->list[i]); - if (!oid) - { - if (!otherInformation->list[i]->category) - return otherInformation->list[i]; - } - else - { - if (otherInformation->list[i]->category && - categoryValue == - *otherInformation->list[i]->category->categoryValue && - !oid_oidcmp (oid, otherInformation->list[i]->category-> - categoryTypeId)) - return otherInformation->list[i]; - } - } - if (!createFlag) - return 0; - otherInformation->list[i] = (Z_OtherInformationUnit*) - odr_malloc (odr_encode(), sizeof(Z_OtherInformationUnit)); - if (oid) + return yaz_oi_update (otherInformationP, + (createFlag ? odr_encode() : 0), + oid, categoryValue, deleteFlag); +} + +Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str) +{ + Z_ReferenceId* id = NULL; + + if ( str ) { - otherInformation->list[i]->category = (Z_InfoCategory*) - odr_malloc (odr_encode(), sizeof(Z_InfoCategory)); - otherInformation->list[i]->category->categoryTypeId = (int*) - odr_oiddup (odr_encode(), oid); - otherInformation->list[i]->category->categoryValue = (int*) - odr_malloc (odr_encode(), sizeof(int)); - *otherInformation->list[i]->category->categoryValue = - categoryValue; + id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id)); + id->size = id->len = strlen(str); + id->buf = (unsigned char *) str; } - else - otherInformation->list[i]->category = 0; - otherInformation->list[i]->which = Z_OtherInfo_characterInfo; - otherInformation->list[i]->information.characterInfo = 0; - - otherInformation->num_elements = i+1; - return otherInformation->list[i]; + + return id; }