X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=144e46a66f4638e4bbd63478e0f0b3f567413722;hb=fd583b87d80abbd8235d4dc777296e19e7adda00;hp=ad60d25caecb452e4fdb0fbd8d8c1ce1a3b0d2e0;hpb=a1ef872694c141f21afdbb3e0798b60fc1421429;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index ad60d25..144e46a 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_virt_db.cpp,v 1.30 2006-01-17 13:54:54 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_virt_db.cpp,v 1.42 2006-06-28 22:46:58 adam Exp $ + Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" @@ -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; @@ -66,6 +68,11 @@ namespace yp2 { void close(Package &package); typedef std::map::iterator Sets_it; + void fixup_npr(Package &p, BackendPtr b); + + void fixup_npr(Z_Records *records, std::string database, + ODR odr); + BackendPtr lookup_backend_from_databases( std::list databases); BackendPtr create_backend_from_databases( @@ -80,25 +87,20 @@ 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); private: - boost::mutex m_sessions_mutex; std::mapm_maps; - typedef std::map::iterator Sets_it; - boost::mutex m_mutex; boost::condition m_cond_session_ready; - std::map m_clients; + std::map m_clients; }; } } -using namespace yp2; - yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( std::list databases) { @@ -127,7 +129,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( for (; db_it != databases.end(); db_it++) { std::map::iterator map_it; - map_it = m_p->m_maps.find(*db_it); + map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it)); if (map_it == m_p->m_maps.end()) // database not found { error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -159,7 +161,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( } yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( - std::list databases, Package &package, + std::list databases, mp::Package &package, int &error_code, std::string &addinfo) { BackendPtr b = create_backend_from_databases(databases, error_code, @@ -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); @@ -195,24 +200,23 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( init_package.request() = init_apdu; init_package.move(b->m_route); // sending init - - if (init_package.session().is_closed()) - { - error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; - // addinfo = database; - BackendPtr null; - return null; - } + Z_GDU *gdu = init_package.response().get(); // we hope to get an init response if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == Z_APDU_initResponse) { - if (ODR_MASK_GET(gdu->u.z3950->u.initResponse->options, - Z_Options_namedResultSets)) + Z_InitResponse *res = gdu->u.z3950->u.initResponse; + if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) { b->m_named_result_sets = true; } + if (!*res->result) + { + mp::util::get_init_diagnostics(res, error_code, addinfo); + BackendPtr null; + return null; + } } else { @@ -221,16 +225,24 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( BackendPtr null; return null; } + if (init_package.session().is_closed()) + { + error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; + // addinfo = database; + BackendPtr null; + return null; + } + m_backend_list.push_back(b); return b; } -void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) +void yf::Virt_db::Frontend::search(mp::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; @@ -325,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; @@ -342,11 +354,11 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) package.session().close(); return; } - package.response() = search_package.response(); - b->m_number_of_sets++; m_sets[resultSetId] = Virt_db::Set(b, backend_setname); + fixup_npr(search_package, b); + package.response() = search_package.response(); } yf::Virt_db::Frontend::Frontend(Rep *rep) @@ -355,7 +367,7 @@ yf::Virt_db::Frontend::Frontend(Rep *rep) m_is_virtual = false; } -void yf::Virt_db::Frontend::close(Package &package) +void yf::Virt_db::Frontend::close(mp::Package &package) { std::list::const_iterator b_it; @@ -373,11 +385,11 @@ yf::Virt_db::Frontend::~Frontend() { } -yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) +yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; while(true) { @@ -398,10 +410,10 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) return f; } -void yf::Virt_db::Rep::release_frontend(Package &package) +void yf::Virt_db::Rep::release_frontend(mp::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()) @@ -450,11 +462,51 @@ yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep) yf::Virt_db::~Virt_db() { } -void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) + +void yf::Virt_db::Frontend::fixup_npr(Z_Records *records, std::string database, + ODR odr) +{ + if (records && records->which == Z_Records_DBOSD) + { + Z_NamePlusRecordList *nprlist = records->u.databaseOrSurDiagnostics; + int i; + for (i = 0; i < nprlist->num_records; i++) + { + Z_NamePlusRecord *npr = nprlist->records[i]; + npr->databaseName = odr_strdup(odr, database.c_str()); + } + } +} + +void yf::Virt_db::Frontend::fixup_npr(mp::Package &p, BackendPtr b) +{ + Z_GDU *gdu = p.response().get(); + mp::odr odr; + std::string database = "dummy"; + std::list::const_iterator db_it = + b->m_frontend_databases.begin(); + if (db_it != b->m_frontend_databases.end()) + database = *db_it; + + if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == + Z_APDU_presentResponse) + { + fixup_npr(gdu->u.z3950->u.presentResponse->records, database, odr); + p.response() = gdu; + } + if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == + Z_APDU_searchResponse) + { + fixup_npr(gdu->u.z3950->u.searchResponse->records, database, odr); + p.response() = gdu; + } +} + +void yf::Virt_db::Frontend::present(mp::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()) @@ -468,7 +520,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()); @@ -480,6 +532,8 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) present_package.move(sets_it->second.m_backend->m_route); + fixup_npr(present_package, sets_it->second.m_backend); + if (present_package.session().is_closed()) { package.response() = present_package.response(); @@ -493,11 +547,11 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) delete id; } -void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) +void yf::Virt_db::Frontend::scan(mp::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; @@ -541,9 +595,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); @@ -563,7 +617,8 @@ void yf::Virt_db::add_map_db2targets(std::string db, std::list targets, std::string route) { - m_p->m_maps[db] = Virt_db::Map(targets, route); + m_p->m_maps[mp::util::database_name_normalize(db)] + = Virt_db::Map(targets, route); } @@ -574,10 +629,11 @@ void yf::Virt_db::add_map_db2target(std::string db, std::list targets; targets.push_back(target); - m_p->m_maps[db] = Virt_db::Map(targets, route); + m_p->m_maps[mp::util::database_name_normalize(db)] + = Virt_db::Map(targets, route); } -void yf::Virt_db::process(Package &package) const +void yf::Virt_db::process(mp::Package &package) const { FrontendPtr f = m_p->get_frontend(package); @@ -588,11 +644,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; @@ -633,7 +691,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, @@ -654,9 +712,13 @@ void yf::Virt_db::process(Package &package) const { f->scan(package, apdu); } + else if (apdu->which == Z_APDU_close) + { + package.session().close(); + } else { - yp2::odr odr; + mp::odr odr; package.response() = odr.create_close( apdu, Z_Close_protocolError, @@ -669,7 +731,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) { @@ -685,23 +747,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"); @@ -709,13 +771,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