projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various link to reference. Added partinfo element for reference
[metaproxy-moved-to-github.git]
/
src
/
filter_z3950_client.cpp
diff --git
a/src/filter_z3950_client.cpp
b/src/filter_z3950_client.cpp
index
594a66b
..
2d9e6a6
100644
(file)
--- a/
src/filter_z3950_client.cpp
+++ b/
src/filter_z3950_client.cpp
@@
-1,7
+1,7
@@
-/* $Id: filter_z3950_client.cpp,v 1.21 2006-01-17 13:34:51 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: filter_z3950_client.cpp,v 1.28 2006-08-30 12:27:34 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-24,13
+24,14
@@
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
#include <yaz/otherinfo.h>
#include <yaz/diagbib1.h>
-#include <yaz++/socket-manager.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/z-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/z-assoc.h>
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
-namespace yp2 {
+namespace metaproxy_1 {
namespace filter {
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Rep;
namespace filter {
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Rep;
@@
-61,10
+62,11
@@
namespace yp2 {
class Z3950Client::Rep {
public:
class Z3950Client::Rep {
public:
+ // number of seconds to wait before we give up request
int m_timeout_sec;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
int m_timeout_sec;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
- std::map<yp2::Session,Z3950Client::Assoc *> m_clients;
+ std::map<mp::Session,Z3950Client::Assoc *> m_clients;
Z3950Client::Assoc *get_assoc(Package &package);
void send_and_receive(Package &package,
yf::Z3950Client::Assoc *c);
Z3950Client::Assoc *get_assoc(Package &package);
void send_and_receive(Package &package,
yf::Z3950Client::Assoc *c);
@@
-73,7
+75,7
@@
namespace yp2 {
}
}
}
}
-using namespace yp2;
+using namespace mp;
yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
@@
-104,7
+106,7
@@
void yf::Z3950Client::Assoc::failNotify()
{
m_waiting = false;
{
m_waiting = false;
- yp2::odr odr;
+ mp::odr odr;
if (m_package)
{
if (m_package)
{
@@
-125,7
+127,7
@@
void yf::Z3950Client::Assoc::timeoutNotify()
{
m_waiting = false;
{
m_waiting = false;
- yp2::odr odr;
+ mp::odr odr;
if (m_package)
{
if (m_package)
{
@@
-175,7
+177,7
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
// only one thread messes with the clients list at a time
boost::mutex::scoped_lock lock(m_mutex);
// only one thread messes with the clients list at a time
boost::mutex::scoped_lock lock(m_mutex);
- std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+ std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
Z_GDU *gdu = package.request().get();
// only deal with Z39.50
Z_GDU *gdu = package.request().get();
// only deal with Z39.50
@@
-191,6
+193,7
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
while(true)
{
#if 0
while(true)
{
#if 0
+ // double init .. NOT working yet
if (gdu && gdu->which == Z_GDU_Z3950 &&
gdu->u.z3950->which == Z_APDU_initRequest)
{
if (gdu && gdu->which == Z_GDU_Z3950 &&
gdu->u.z3950->which == Z_APDU_initRequest)
{
@@
-214,7
+217,7
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
// check that it is init. If not, close
if (apdu->which != Z_APDU_initRequest)
{
// check that it is init. If not, close
if (apdu->which != Z_APDU_initRequest)
{
- yp2::odr odr;
+ mp::odr odr;
package.response() = odr.create_close(apdu,
Z_Close_protocolError,
package.response() = odr.create_close(apdu,
Z_Close_protocolError,
@@
-224,12
+227,11
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
return 0;
}
std::list<std::string> vhosts;
return 0;
}
std::list<std::string> vhosts;
- yp2::util::get_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
- true, vhosts);
+ mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo, vhosts);
size_t no_vhosts = vhosts.size();
if (no_vhosts == 0)
{
size_t no_vhosts = vhosts.size();
if (no_vhosts == 0)
{
- yp2::odr odr;
+ mp::odr odr;
package.response() = odr.create_initResponse(
apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
package.response() = odr.create_initResponse(
apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
@@
-240,10
+242,10
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
}
if (no_vhosts > 1)
{
}
if (no_vhosts > 1)
{
- yp2::odr odr;
+ mp::odr odr;
package.response() = odr.create_initResponse(
apdu,
package.response() = odr.create_initResponse(
apdu,
- YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
+ YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP,
"z3950_client: Can not cope with multiple vhosts");
package.session().close();
return 0;
"z3950_client: Can not cope with multiple vhosts");
package.session().close();
return 0;
@@
-251,11
+253,11
@@
yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
std::list<std::string>::const_iterator v_it = vhosts.begin();
std::list<std::string> dblist;
std::string host;
std::list<std::string>::const_iterator v_it = vhosts.begin();
std::list<std::string> dblist;
std::string host;
- yp2::util::split_zurl(*v_it, host, dblist);
+ mp::util::split_zurl(*v_it, host, dblist);
if (dblist.size())
{
if (dblist.size())
{
- std::cout << "z3950_client: No databases in vhost supported\n";
+ ; // z3950_client: Databases in vhost ignored
}
yazpp_1::SocketManager *sm = new yazpp_1::SocketManager;
}
yazpp_1::SocketManager *sm = new yazpp_1::SocketManager;
@@
-284,7
+286,7
@@
void yf::Z3950Client::Rep::send_and_receive(Package &package,
if (!c->m_connected)
{
c->client(c->m_host.c_str());
if (!c->m_connected)
{
c->client(c->m_host.c_str());
- c->timeout(1);
+ c->timeout(1); // so timeoutNotify gets called once per second
while (!c->m_destroyed && c->m_waiting
&& c->m_socket_manager->processEvent() > 0)
while (!c->m_destroyed && c->m_waiting
&& c->m_socket_manager->processEvent() > 0)
@@
-320,7
+322,7
@@
void yf::Z3950Client::Rep::send_and_receive(Package &package,
void yf::Z3950Client::Rep::release_assoc(Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
void yf::Z3950Client::Rep::release_assoc(Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
- std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+ std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
it = m_clients.find(package.session());
if (it != m_clients.end())
it = m_clients.find(package.session());
if (it != m_clients.end())
@@
-370,29
+372,24
@@
void yf::Z3950Client::configure(const xmlNode *ptr)
continue;
if (!strcmp((const char *) ptr->name, "timeout"))
{
continue;
if (!strcmp((const char *) ptr->name, "timeout"))
{
- std::string timeout_str = yp2::xml::get_text(ptr);
- int timeout_sec = atoi(timeout_str.c_str());
- if (timeout_sec < 2)
- throw yp2::filter::FilterException("Bad timeout value "
- + timeout_str);
- m_p->m_timeout_sec = timeout_sec;
+ m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30);
}
else
{
}
else
{
- throw yp2::filter::FilterException("Bad element "
+ throw mp::filter::FilterException("Bad element "
+ std::string((const char *)
ptr->name));
}
}
}
+ std::string((const char *)
ptr->name));
}
}
}
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
{
{
- return new yp2::filter::Z3950Client;
+ return new mp::filter::Z3950Client;
}
extern "C" {
}
extern "C" {
- struct yp2_filter_struct yp2_filter_z3950_client = {
+ struct metaproxy_1_filter_struct metaproxy_1_filter_z3950_client = {
0,
"z3950_client",
filter_creator
0,
"z3950_client",
filter_creator