-/* $Id: filter_multi.cpp,v 1.5 2006-01-17 17:55:40 adam Exp $
+/* $Id: filter_multi.cpp,v 1.8 2006-01-18 10:57:27 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
void close(Package &package);
void search(Package &package, Z_APDU *apdu);
void present(Package &package, Z_APDU *apdu);
+ void scan(Package &package, Z_APDU *apdu);
Rep *m_p;
};
struct Multi::Map {
private:
boost::mutex m_sessions_mutex;
std::map<std::string, Multi::Map>m_maps;
-
+ std::map<std::string,std::string> m_target_route;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<yp2::Session, FrontendPtr> m_clients;
Backend *b = new Backend;
b->m_vhost = *t_it;
+ b->m_route = m_p->m_target_route[*t_it];
// b->m_route unset
b->m_package = PackagePtr(new Package(s, package.origin()));
BackendPtr b = *bit;
Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
- yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
- VAL_PROXY, 1, b->m_vhost.c_str());
-
+ std::list<std::string>vhost_one;
+ vhost_one.push_back(b->m_vhost);
+ yp2::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo,
+ odr, vhost_one);
+
Z_InitRequest *req = init_apdu->u.initRequest;
ODR_MASK_SET(req->options, Z_Options_search);
ODR_MASK_SET(req->options, Z_Options_present);
ODR_MASK_SET(req->options, Z_Options_namedResultSets);
+ ODR_MASK_SET(req->options, Z_Options_scan);
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
package.response() = f_apdu;
}
+void yf::Multi::Frontend::scan(Package &package, Z_APDU *apdu_req)
+{
+ if (m_backend_list.size() > 1)
+ {
+ yp2::odr odr;
+ Z_APDU *f_apdu =
+ odr.create_scanResponse(
+ apdu_req, YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP, 0);
+ package.response() = f_apdu;
+ return;
+ }
+ Z_ScanRequest *req = apdu_req->u.scanRequest;
+
+ int default_num_db = req->num_databaseNames;
+ char **default_db = req->databaseNames;
+
+ std::list<BackendPtr>::const_iterator bit;
+ for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
+ {
+ PackagePtr p = (*bit)->m_package;
+ yp2::odr odr;
+
+ if (!yp2::util::set_databases_from_zurl(odr, (*bit)->m_vhost,
+ &req->num_databaseNames,
+ &req->databaseNames))
+ {
+ req->num_databaseNames = default_num_db;
+ req->databaseNames = default_db;
+ }
+ p->request() = apdu_req;
+ p->copy_filter(package);
+ }
+ multi_move(m_backend_list);
+
+ for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
+ {
+ PackagePtr p = (*bit)->m_package;
+
+ if (p->session().is_closed()) // if any backend closes, close frontend
+ package.session().close();
+
+ Z_GDU *gdu = p->response().get();
+ if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
+ Z_APDU_scanResponse)
+ {
+ package.response() = p->response();
+ break;
+ }
+ else
+ {
+ // if any target does not return scan response - return that
+ package.response() = p->response();
+ return;
+ }
+ }
+}
+
void yf::Multi::process(Package &package) const
{
FrontendPtr f = m_p->get_frontend(package);
{
f->present(package, apdu);
}
+ else if (apdu->which == Z_APDU_scanRequest)
+ {
+ f->scan(package, apdu);
+ }
else
{
yp2::odr odr;
{
if (ptr->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp((const char *) ptr->name, "virtual"))
+ if (!strcmp((const char *) ptr->name, "target"))
+ {
+ std::string route = yp2::xml::get_route(ptr);
+ std::string target = yp2::xml::get_text(ptr);
+ std::cout << "route=" << route << " target=" << target << "\n";
+ m_p->m_target_route[target] = route;
+ }
+ else if (!strcmp((const char *) ptr->name, "virtual"))
{
std::list<std::string> targets;
std::string vhost;