X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=zlint%2Fzlint.cpp;h=46cbf8e195e47113ac4ed2a10093de08ce51ad0b;hb=75f7c460d6d10961f3d2ed841b757d6d6b7725d7;hp=028e6d65cda8b05c295a9a010df3d99494f04ab4;hpb=40213edfa0408f88b008c3d1ee4a4f90dcdf2fb9;p=yazpp-moved-to-github.git diff --git a/zlint/zlint.cpp b/zlint/zlint.cpp index 028e6d6..46cbf8e 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.5 2004-03-25 23:14:07 adam Exp $ + * $Id: zlint.cpp,v 1.10 2005-06-08 13:28:06 adam Exp $ */ #include @@ -29,8 +29,8 @@ private: int m_test_reported; }; -Zlint::Zlint(IYaz_PDU_Observable *the_PDU_Observable) : - Yaz_Z_Assoc(the_PDU_Observable) +Zlint::Zlint(IPDU_Observable *the_PDU_Observable) : + Z_Assoc(the_PDU_Observable) { m_PDU_Observable = the_PDU_Observable; @@ -57,6 +57,7 @@ void Zlint::set_host(const char *cp) xfree(m_host); m_host = xstrdup(cp); client(m_host); + timeout(30); const char *basep; cs_get_host_args(m_host, &basep); @@ -74,6 +75,7 @@ void Zlint::timeoutNotify() { close(); client(m_host); + timeout(30); return; } } @@ -88,6 +90,7 @@ void Zlint::failNotify() { close(); client(m_host); + timeout(30); return; } } @@ -115,6 +118,7 @@ void Zlint::recv_GDU(Z_GDU *gdu, int len) { close(); client(m_host); + timeout(30); return; } } @@ -128,10 +132,11 @@ void Zlint::close_goto_next() m_cur_test = m_cur_test->m_next; if (m_cur_test) client(m_host); + timeout(30); } -IYaz_PDU_Observer *Zlint::sessionNotify( - IYaz_PDU_Observable *the_PDU_Observable, int fd) +IPDU_Observer *Zlint::sessionNotify( + IPDU_Observable *the_PDU_Observable, int fd) { return 0; } @@ -155,8 +160,6 @@ int Zlint::initResponseGetVersion(Z_InitResponse *init) if (ODR_MASK_GET(init->protocolVersion, no)) { no = i+1; - if (off) - yaz_log(LOG_WARN, "%sbad formatted version"); } else off = 1;