X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=fdbe8272104526c379813e6cc86e147a13c3a7e0;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=4fc928c227eb7eb59afd348362dfdd6763ccf20b;hpb=be83c640396e23420206a204eb78d353aedede05;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 4fc928c..fdbe827 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,5 +1,5 @@ -/* $Id: filter_virt_db.cpp,v 1.31 2006-01-17 16:45:49 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_virt_db.cpp,v 1.36 2006-03-16 10:40:59 adam Exp $ + Copyright (c) 2005-2006, Index Data. %LICENSE% */ @@ -23,9 +23,10 @@ #include #include -namespace yf = yp2::filter; +namespace mp = metaproxy_1; +namespace yf = mp::filter; -namespace yp2 { +namespace metaproxy_1 { namespace filter { struct Virt_db::Set { @@ -43,7 +44,7 @@ namespace yp2 { std::string m_route; }; struct Virt_db::Backend { - yp2::Session m_backend_session; + mp::Session m_backend_session; std::list m_frontend_databases; std::list m_targets; std::string m_route; @@ -53,9 +54,10 @@ namespace yp2 { struct Virt_db::Frontend { Frontend(Rep *rep); ~Frontend(); - yp2::Session m_session; + mp::Session m_session; bool m_is_virtual; bool m_in_use; + yazpp_1::GDU m_init_gdu; std::list m_backend_list; std::map m_sets; @@ -80,7 +82,7 @@ namespace yp2 { }; class Virt_db::Rep { friend class Virt_db; - friend class Frontend; + friend struct Frontend; FrontendPtr get_frontend(Package &package); void release_frontend(Package &package); @@ -92,12 +94,12 @@ namespace yp2 { boost::mutex m_mutex; boost::condition m_cond_session_ready; - std::map m_clients; + std::map m_clients; }; } } -using namespace yp2; +using namespace mp; yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( std::list databases) @@ -169,20 +171,23 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( Package init_package(b->m_backend_session, package.origin()); init_package.copy_filter(package); - yp2::odr odr; + mp::odr odr; Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest); - std::list::const_iterator t_it = b->m_targets.begin(); - int cat = 1; - for (; t_it != b->m_targets.end(); t_it++, cat++) - { - yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr, - VAL_PROXY, cat, t_it->c_str()); - } - + mp::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo, odr, + b->m_targets); Z_InitRequest *req = init_apdu->u.initRequest; + // copy stuff from Frontend Init Request + Z_GDU *org_gdu = m_init_gdu.get(); + Z_InitRequest *org_init = org_gdu->u.z3950->u.initRequest; + + req->idAuthentication = org_init->idAuthentication; + req->implementationId = org_init->implementationId; + req->implementationName = org_init->implementationName; + req->implementationVersion = org_init->implementationVersion; + ODR_MASK_SET(req->options, Z_Options_search); ODR_MASK_SET(req->options, Z_Options_present); ODR_MASK_SET(req->options, Z_Options_namedResultSets); @@ -206,10 +211,9 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( { b->m_named_result_sets = true; } - std::cout << "GOT INIT res=" << *res->result << "\n"; if (!*res->result) { - yp2::util::get_init_diagnostics(res, error_code, addinfo); + mp::util::get_init_diagnostics(res, error_code, addinfo); BackendPtr null; return null; } @@ -238,7 +242,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) Z_SearchRequest *req = apdu_req->u.searchRequest; std::string vhost; std::string resultSetId = req->resultSetName; - yp2::odr odr; + mp::odr odr; std::list databases; int i; @@ -333,9 +337,9 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) std::list::const_iterator t_it = b->m_targets.begin(); if (t_it != b->m_targets.end()) { - if (!yp2::util::set_databases_from_zurl(odr, *t_it, + mp::util::set_databases_from_zurl(odr, *t_it, &req->num_databaseNames, - &req->databaseNames)); + &req->databaseNames); } *req->replaceIndicator = 1; @@ -385,7 +389,7 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; while(true) { @@ -409,7 +413,7 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) void yf::Virt_db::Rep::release_frontend(Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; it = m_clients.find(package.session()); if (it != m_clients.end()) @@ -462,7 +466,7 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) { Z_PresentRequest *req = apdu_req->u.presentRequest; std::string resultSetId = req->resultSetId; - yp2::odr odr; + mp::odr odr; Sets_it sets_it = m_sets.find(resultSetId); if (sets_it == m_sets.end()) @@ -476,7 +480,7 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) return; } Session *id = - new yp2::Session(sets_it->second.m_backend->m_backend_session); + new mp::Session(sets_it->second.m_backend->m_backend_session); // sending present to backend Package present_package(*id, package.origin()); @@ -505,7 +509,7 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) { Z_ScanRequest *req = apdu_req->u.scanRequest; std::string vhost; - yp2::odr odr; + mp::odr odr; std::list databases; int i; @@ -549,9 +553,9 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) std::list::const_iterator t_it = b->m_targets.begin(); if (t_it != b->m_targets.end()) { - if (!yp2::util::set_databases_from_zurl(odr, *t_it, + mp::util::set_databases_from_zurl(odr, *t_it, &req->num_databaseNames, - &req->databaseNames)); + &req->databaseNames); } scan_package.request() = yazpp_1::GDU(apdu_req); @@ -596,11 +600,13 @@ void yf::Virt_db::process(Package &package) const { Z_InitRequest *req = gdu->u.z3950->u.initRequest; - const char *vhost = - yaz_oi_get_string_oidval(&req->otherInfo, VAL_PROXY, 1, 0); - if (!vhost) + std::list vhosts; + mp::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts); + if (vhosts.size() == 0) { - yp2::odr odr; + f->m_init_gdu = gdu; + + mp::odr odr; Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0); Z_InitResponse *resp = apdu->u.initResponse; @@ -641,7 +647,7 @@ void yf::Virt_db::process(Package &package) const Z_APDU *apdu = gdu->u.z3950; if (apdu->which == Z_APDU_initRequest) { - yp2::odr odr; + mp::odr odr; package.response() = odr.create_close( apdu, @@ -664,7 +670,7 @@ void yf::Virt_db::process(Package &package) const } else { - yp2::odr odr; + mp::odr odr; package.response() = odr.create_close( apdu, Z_Close_protocolError, @@ -677,7 +683,7 @@ void yf::Virt_db::process(Package &package) const } -void yp2::filter::Virt_db::configure(const xmlNode * ptr) +void mp::filter::Virt_db::configure(const xmlNode * ptr) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -693,23 +699,23 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr) if (v_node->type != XML_ELEMENT_NODE) continue; - if (yp2::xml::is_element_yp2(v_node, "database")) - database = yp2::xml::get_text(v_node); - else if (yp2::xml::is_element_yp2(v_node, "target")) - targets.push_back(yp2::xml::get_text(v_node)); + if (mp::xml::is_element_yp2(v_node, "database")) + database = mp::xml::get_text(v_node); + else if (mp::xml::is_element_yp2(v_node, "target")) + targets.push_back(mp::xml::get_text(v_node)); else - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Bad element " + std::string((const char *) v_node->name) + " in virtual section" ); } - std::string route = yp2::xml::get_route(ptr); + std::string route = mp::xml::get_route(ptr); add_map_db2targets(database, targets, route); } else { - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); @@ -717,13 +723,13 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr) } } -static yp2::filter::Base* filter_creator() +static mp::filter::Base* filter_creator() { - return new yp2::filter::Virt_db; + return new mp::filter::Virt_db; } extern "C" { - struct yp2_filter_struct yp2_filter_virt_db = { + struct metaproxy_1_filter_struct metaproxy_1_filter_virt_db = { 0, "virt_db", filter_creator