X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=692d3613d1c9d79632a4f5254deb61e210610b52;hb=0d49c50096893321c3b5f280d4904e0705415079;hp=fdbe8272104526c379813e6cc86e147a13c3a7e0;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index fdbe827..692d361 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_virt_db.cpp,v 1.36 2006-03-16 10:40:59 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.45 2006-08-30 12:27:34 adam Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" @@ -68,6 +68,12 @@ namespace metaproxy_1 { 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( @@ -87,11 +93,8 @@ namespace metaproxy_1 { 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; @@ -99,8 +102,6 @@ namespace metaproxy_1 { } } -using namespace mp; - yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( std::list databases) { @@ -129,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; @@ -161,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, @@ -237,7 +238,7 @@ 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; @@ -354,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) @@ -367,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; @@ -385,7 +386,7 @@ 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); @@ -410,7 +411,7 @@ 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; @@ -462,7 +463,82 @@ 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; @@ -492,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(); @@ -505,7 +583,7 @@ 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; @@ -575,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); } @@ -586,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); @@ -601,7 +681,7 @@ void yf::Virt_db::process(Package &package) const Z_InitRequest *req = gdu->u.z3950->u.initRequest; std::list vhosts; - mp::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts); + mp::util::get_vhost_otherinfo(req->otherInfo, vhosts); if (vhosts.size() == 0) { f->m_init_gdu = gdu; @@ -668,6 +748,10 @@ void yf::Virt_db::process(Package &package) const { f->scan(package, apdu); } + else if (apdu->which == Z_APDU_close) + { + package.session().close(); + } else { mp::odr odr;