X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=cf666d212733a59794123832c8df7f5fd0812edd;hb=ba1d95aa261abbe9f85b0bffa1926a34432aeadd;hp=7947c6b4fb0960e632822263e23d68b0ee402655;hpb=357884a3c428262e37911c9429dc122fb0243bcd;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 7947c6b..cf666d2 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_virt_db.cpp,v 1.35 2006-02-02 11:33:46 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_virt_db.cpp,v 1.44 2006-08-01 13:24:53 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,7 +54,7 @@ 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; @@ -67,6 +68,12 @@ namespace yp2 { void close(Package &package); typedef std::map::iterator Sets_it; + void fixup_package(Package &p, BackendPtr b); + void fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, + BackendPtr b); + void fixup_npr_records(ODR odr, Z_Records *records, + BackendPtr b); + BackendPtr lookup_backend_from_databases( std::list databases); BackendPtr create_backend_from_databases( @@ -86,20 +93,15 @@ namespace yp2 { 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) { @@ -128,7 +130,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; @@ -160,7 +162,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, @@ -170,11 +172,11 @@ 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); - yp2::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo, odr, + mp::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo, odr, b->m_targets); Z_InitRequest *req = init_apdu->u.initRequest; @@ -212,7 +214,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( } 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; } @@ -236,12 +238,12 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( 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; @@ -336,7 +338,7 @@ 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()) { - yp2::util::set_databases_from_zurl(odr, *t_it, + mp::util::set_databases_from_zurl(odr, *t_it, &req->num_databaseNames, &req->databaseNames); } @@ -353,11 +355,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_package(search_package, b); + package.response() = search_package.response(); } yf::Virt_db::Frontend::Frontend(Rep *rep) @@ -366,7 +368,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; @@ -384,11 +386,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) { @@ -409,10 +411,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()) @@ -461,11 +463,86 @@ 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_record(ODR odr, Z_NamePlusRecord *npr, + BackendPtr b) +{ + if (npr->databaseName) + { + std::string b_database = std::string(npr->databaseName); + + // consider each of the frontend databases.. + std::list::const_iterator db_it; + for (db_it = b->m_frontend_databases.begin(); + db_it != b->m_frontend_databases.end(); db_it++) + { + // see which target it corresponds to.. (if any) + std::map::const_iterator map_it; + map_it = m_p->m_maps.find(*db_it); + if (map_it != m_p->m_maps.end()) + { + Virt_db::Map m = map_it->second; + + std::list::const_iterator t; + for (t = m.m_targets.begin(); t != m.m_targets.end(); t++) + { + if (*t == b_database) + { + npr->databaseName = odr_strdup(odr, (*db_it).c_str()); + return; + } + } + } + + } + db_it = b->m_frontend_databases.begin(); + if (db_it != b->m_frontend_databases.end()) + { + std::string database = *db_it; + npr->databaseName = odr_strdup(odr, database.c_str()); + } + } +} + +void yf::Virt_db::Frontend::fixup_npr_records(ODR odr, Z_Records *records, + BackendPtr b) +{ + if (records && records->which == Z_Records_DBOSD) + { + Z_NamePlusRecordList *nprlist = records->u.databaseOrSurDiagnostics; + int i; + for (i = 0; i < nprlist->num_records; i++) + { + fixup_npr_record(odr, nprlist->records[i], b); + } + } +} + +void yf::Virt_db::Frontend::fixup_package(mp::Package &p, BackendPtr b) +{ + Z_GDU *gdu = p.response().get(); + mp::odr odr; + + if (gdu && gdu->which == Z_GDU_Z3950) + { + Z_APDU *apdu = gdu->u.z3950; + if (apdu->which == Z_APDU_presentResponse) + { + fixup_npr_records(odr, apdu->u.presentResponse->records, b); + p.response() = gdu; + } + else if (apdu->which == Z_APDU_searchResponse) + { + fixup_npr_records(odr, apdu->u.searchResponse->records, b); + 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()) @@ -479,7 +556,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()); @@ -491,6 +568,8 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) present_package.move(sets_it->second.m_backend->m_route); + fixup_package(present_package, sets_it->second.m_backend); + if (present_package.session().is_closed()) { package.response() = present_package.response(); @@ -504,11 +583,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; @@ -552,7 +631,7 @@ 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()) { - yp2::util::set_databases_from_zurl(odr, *t_it, + mp::util::set_databases_from_zurl(odr, *t_it, &req->num_databaseNames, &req->databaseNames); } @@ -574,7 +653,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); } @@ -585,10 +665,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); @@ -600,12 +681,12 @@ void yf::Virt_db::process(Package &package) const Z_InitRequest *req = gdu->u.z3950->u.initRequest; std::list vhosts; - yp2::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts); + mp::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts); if (vhosts.size() == 0) { f->m_init_gdu = gdu; - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0); Z_InitResponse *resp = apdu->u.initResponse; @@ -646,7 +727,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, @@ -667,9 +748,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, @@ -682,7 +767,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) { @@ -698,23 +783,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"); @@ -722,13 +807,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