-/* $Id: filter_z3950_client.cpp,v 1.25 2006-03-29 13:44:45 adam Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_z3950_client.cpp,v 1.30 2007-01-26 14:49:22 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
class Z3950Client::Rep {
public:
+ // number of seconds to wait before we give up request
int m_timeout_sec;
+ std::string m_default_target;
+ std::string m_force_target;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<mp::Session,Z3950Client::Assoc *> m_clients;
while(true)
{
#if 0
+ // double init .. NOT working yet
if (gdu && gdu->which == Z_GDU_Z3950 &&
gdu->u.z3950->which == Z_APDU_initRequest)
{
package.session().close();
return 0;
}
- std::list<std::string> vhosts;
- mp::util::get_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
- true, vhosts);
- size_t no_vhosts = vhosts.size();
- if (no_vhosts == 0)
+ std::string target = m_force_target;
+ if (!target.length())
{
- mp::odr odr;
- package.response() = odr.create_initResponse(
- apdu,
- YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
- "z3950_client: No virtal host given");
-
- package.session().close();
- return 0;
- }
- if (no_vhosts > 1)
- {
- mp::odr odr;
- package.response() = odr.create_initResponse(
- apdu,
- YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP,
- "z3950_client: Can not cope with multiple vhosts");
- package.session().close();
- return 0;
+ target = m_default_target;
+ std::list<std::string> vhosts;
+ mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
+ vhosts);
+ size_t no_vhosts = vhosts.size();
+ if (no_vhosts == 1)
+ {
+ std::list<std::string>::const_iterator v_it = vhosts.begin();
+ target = *v_it;
+ }
+ else if (no_vhosts == 0)
+ {
+ if (!target.length())
+ {
+ // no default target. So we don't know where to connect
+ mp::odr odr;
+ package.response() = odr.create_initResponse(
+ apdu,
+ YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
+ "z3950_client: No virtal host given");
+
+ package.session().close();
+ return 0;
+ }
+ }
+ else if (no_vhosts > 1)
+ {
+ mp::odr odr;
+ package.response() = odr.create_initResponse(
+ apdu,
+ YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP,
+ "z3950_client: Can not cope with multiple vhosts");
+ package.session().close();
+ return 0;
+ }
}
- std::list<std::string>::const_iterator v_it = vhosts.begin();
std::list<std::string> dblist;
std::string host;
- mp::util::split_zurl(*v_it, host, dblist);
+ mp::util::split_zurl(target, host, dblist);
if (dblist.size())
{
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)
continue;
if (!strcmp((const char *) ptr->name, "timeout"))
{
- std::string timeout_str = mp::xml::get_text(ptr);
- int timeout_sec = atoi(timeout_str.c_str());
- if (timeout_sec < 2)
- throw mp::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 if (!strcmp((const char *) ptr->name, "default_target"))
+ {
+ m_p->m_default_target = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "force_target"))
+ {
+ m_p->m_force_target = mp::xml::get_text(ptr);
}
else
{