-/* $Id: filter_z3950_client.cpp,v 1.19 2006-01-11 11:51:50 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.23 2006-01-17 17:55:18 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
if (m_package)
{
- m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+ Z_GDU *gdu = m_package->request().get();
+ Z_APDU *apdu = 0;
+ if (gdu && gdu->which == Z_GDU_Z3950)
+ apdu = gdu->u.z3950;
+
+ m_package->response() = odr.create_close(apdu, Z_Close_peerAbort, 0);
m_package->session().close();
}
}
if (m_package)
{
+ Z_GDU *gdu = m_package->request().get();
+ Z_APDU *apdu = 0;
+ if (gdu && gdu->which == Z_GDU_Z3950)
+ apdu = gdu->u.z3950;
+
if (m_connected)
- m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
+ m_package->response() =
+ odr.create_close(apdu, Z_Close_lackOfActivity, 0);
else
- m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+ m_package->response() =
+ odr.create_close(apdu, Z_Close_peerAbort, 0);
m_package->session().close();
}
{
yp2::odr odr;
- package.response() = odr.create_close(Z_Close_protocolError,
+ package.response() = odr.create_close(apdu,
+ Z_Close_protocolError,
"First PDU was not an "
"Initialize Request");
package.session().close();
return 0;
}
- // check virtual host
- const char *vhost =
- yaz_oi_get_string_oidval(&apdu->u.initRequest->otherInfo,
- VAL_PROXY,
- /* categoryValue */ 1, /* delete */ 1);
- if (!vhost)
+ std::list<std::string> vhosts;
+ yp2::util::get_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
+ true, vhosts);
+ size_t no_vhosts = vhosts.size();
+ if (no_vhosts == 0)
{
yp2::odr odr;
package.response() = odr.create_initResponse(
+ apdu,
YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
- "Virtual host not given");
+ "z3950_client: No virtal host given");
package.session().close();
return 0;
}
-
+ if (no_vhosts > 1)
+ {
+ yp2::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;
+ yp2::util::split_zurl(*v_it, host, dblist);
+
+ if (dblist.size())
+ {
+ ; // z3950_client: Databases in vhost ignored
+ }
+
yazpp_1::SocketManager *sm = new yazpp_1::SocketManager;
yazpp_1::PDU_Assoc *pdu_as = new yazpp_1::PDU_Assoc(sm);
- yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, vhost,
+ yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as,
+ host.c_str(),
m_timeout_sec);
m_clients[package.session()] = as;
return as;