X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=7ed3395df49ddd982e27cd757ac3cbb201e795bd;hb=63d38d164424c752c996268074b0313e27848703;hp=cf666d212733a59794123832c8df7f5fd0812edd;hpb=e33571cd7d86b390db9fd06fbcb10ee69bd161d3;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index cf666d2..7ed3395 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,8 +1,20 @@ -/* $Id: filter_virt_db.cpp,v 1.44 2006-08-01 13:24:53 adam Exp $ - Copyright (c) 2005-2006, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2008 Index Data - See the LICENSE file for details - */ +Metaproxy is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" @@ -29,7 +41,7 @@ namespace yf = mp::filter; namespace metaproxy_1 { namespace filter { - struct Virt_db::Set { + struct VirtualDB::Set { Set(BackendPtr b, std::string setname); Set(); ~Set(); @@ -37,13 +49,13 @@ namespace metaproxy_1 { BackendPtr m_backend; std::string m_setname; }; - struct Virt_db::Map { + struct VirtualDB::Map { Map(std::list targets, std::string route); Map(); std::list m_targets; std::string m_route; }; - struct Virt_db::Backend { + struct VirtualDB::Backend { mp::Session m_backend_session; std::list m_frontend_databases; std::list m_targets; @@ -51,7 +63,7 @@ namespace metaproxy_1 { bool m_named_result_sets; int m_number_of_sets; }; - struct Virt_db::Frontend { + struct VirtualDB::Frontend { Frontend(Rep *rep); ~Frontend(); mp::Session m_session; @@ -59,14 +71,14 @@ namespace metaproxy_1 { bool m_in_use; yazpp_1::GDU m_init_gdu; std::list m_backend_list; - std::map m_sets; + std::map m_sets; void search(Package &package, Z_APDU *apdu); void present(Package &package, Z_APDU *apdu); void scan(Package &package, Z_APDU *apdu); void close(Package &package); - typedef std::map::iterator Sets_it; + typedef std::map::iterator Sets_it; void fixup_package(Package &p, BackendPtr b); void fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, @@ -86,15 +98,15 @@ namespace metaproxy_1 { int &error_code, std::string &addinfo); Rep *m_p; }; - class Virt_db::Rep { - friend class Virt_db; + class VirtualDB::Rep { + friend class VirtualDB; friend struct Frontend; FrontendPtr get_frontend(Package &package); void release_frontend(Package &package); private: - std::mapm_maps; - typedef std::map::iterator Sets_it; + std::mapm_maps; + typedef std::map::iterator Sets_it; boost::mutex m_mutex; boost::condition m_cond_session_ready; std::map m_clients; @@ -102,7 +114,7 @@ namespace metaproxy_1 { } } -yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::lookup_backend_from_databases( std::list databases) { std::list::const_iterator map_it; @@ -114,7 +126,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( return null; } -yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases( std::list databases, int &error_code, std::string &addinfo) { BackendPtr b(new Backend); @@ -129,19 +141,24 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( std::map targets_dedup; for (; db_it != databases.end(); db_it++) { - std::map::iterator map_it; + std::map::iterator map_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; + error_code = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; addinfo = *db_it; BackendPtr ptr; return ptr; } std::list::const_iterator t_it = map_it->second.m_targets.begin(); - for (; t_it != map_it->second.m_targets.end(); t_it++) - targets_dedup[*t_it] = true; + for (; t_it != map_it->second.m_targets.end(); t_it++) { + if (!targets_dedup[*t_it]) + { + targets_dedup[*t_it] = true; + b->m_targets.push_back(*t_it); + } + } // see if we have a route conflict. if (!first_route && b->m_route != map_it->second.m_route) @@ -154,14 +171,10 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( b->m_route = map_it->second.m_route; first_route = false; } - std::map::const_iterator tm_it = targets_dedup.begin(); - for (; tm_it != targets_dedup.end(); tm_it++) - b->m_targets.push_back(tm_it->first); - return b; } -yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend( std::list databases, mp::Package &package, int &error_code, std::string &addinfo) { @@ -214,6 +227,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( } if (!*res->result) { + error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; mp::util::get_init_diagnostics(res, error_code, addinfo); BackendPtr null; return null; @@ -238,7 +252,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( return b; } -void yf::Virt_db::Frontend::search(mp::Package &package, Z_APDU *apdu_req) +void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req) { Z_SearchRequest *req = apdu_req->u.searchRequest; std::string vhost; @@ -357,18 +371,18 @@ void yf::Virt_db::Frontend::search(mp::Package &package, Z_APDU *apdu_req) } b->m_number_of_sets++; - m_sets[resultSetId] = Virt_db::Set(b, backend_setname); + m_sets[resultSetId] = VirtualDB::Set(b, backend_setname); fixup_package(search_package, b); package.response() = search_package.response(); } -yf::Virt_db::Frontend::Frontend(Rep *rep) +yf::VirtualDB::Frontend::Frontend(Rep *rep) { m_p = rep; m_is_virtual = false; } -void yf::Virt_db::Frontend::close(mp::Package &package) +void yf::VirtualDB::Frontend::close(mp::Package &package) { std::list::const_iterator b_it; @@ -382,15 +396,15 @@ void yf::Virt_db::Frontend::close(mp::Package &package) m_backend_list.clear(); } -yf::Virt_db::Frontend::~Frontend() +yf::VirtualDB::Frontend::~Frontend() { } -yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package) +yf::VirtualDB::FrontendPtr yf::VirtualDB::Rep::get_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; while(true) { @@ -411,10 +425,10 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package) return f; } -void yf::Virt_db::Rep::release_frontend(mp::Package &package) +void yf::VirtualDB::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()) @@ -432,38 +446,38 @@ void yf::Virt_db::Rep::release_frontend(mp::Package &package) } } -yf::Virt_db::Set::Set(BackendPtr b, std::string setname) +yf::VirtualDB::Set::Set(BackendPtr b, std::string setname) : m_backend(b), m_setname(setname) { } -yf::Virt_db::Set::Set() +yf::VirtualDB::Set::Set() { } -yf::Virt_db::Set::~Set() +yf::VirtualDB::Set::~Set() { } -yf::Virt_db::Map::Map(std::list targets, std::string route) +yf::VirtualDB::Map::Map(std::list targets, std::string route) : m_targets(targets), m_route(route) { } -yf::Virt_db::Map::Map() +yf::VirtualDB::Map::Map() { } -yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep) +yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep) { } -yf::Virt_db::~Virt_db() { +yf::VirtualDB::~VirtualDB() { } -void yf::Virt_db::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, +void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, BackendPtr b) { if (npr->databaseName) @@ -476,11 +490,12 @@ void yf::Virt_db::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, 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); + std::map::const_iterator map_it; + + map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it)); if (map_it != m_p->m_maps.end()) { - Virt_db::Map m = map_it->second; + VirtualDB::Map m = map_it->second; std::list::const_iterator t; for (t = m.m_targets.begin(); t != m.m_targets.end(); t++) @@ -503,7 +518,7 @@ void yf::Virt_db::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, } } -void yf::Virt_db::Frontend::fixup_npr_records(ODR odr, Z_Records *records, +void yf::VirtualDB::Frontend::fixup_npr_records(ODR odr, Z_Records *records, BackendPtr b) { if (records && records->which == Z_Records_DBOSD) @@ -517,7 +532,7 @@ void yf::Virt_db::Frontend::fixup_npr_records(ODR odr, Z_Records *records, } } -void yf::Virt_db::Frontend::fixup_package(mp::Package &p, BackendPtr b) +void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b) { Z_GDU *gdu = p.response().get(); mp::odr odr; @@ -538,7 +553,7 @@ void yf::Virt_db::Frontend::fixup_package(mp::Package &p, BackendPtr b) } } -void yf::Virt_db::Frontend::present(mp::Package &package, Z_APDU *apdu_req) +void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req) { Z_PresentRequest *req = apdu_req->u.presentRequest; std::string resultSetId = req->resultSetId; @@ -583,7 +598,7 @@ void yf::Virt_db::Frontend::present(mp::Package &package, Z_APDU *apdu_req) delete id; } -void yf::Virt_db::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) +void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) { Z_ScanRequest *req = apdu_req->u.scanRequest; std::string vhost; @@ -649,16 +664,16 @@ void yf::Virt_db::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) } -void yf::Virt_db::add_map_db2targets(std::string db, +void yf::VirtualDB::add_map_db2targets(std::string db, std::list targets, std::string route) { m_p->m_maps[mp::util::database_name_normalize(db)] - = Virt_db::Map(targets, route); + = VirtualDB::Map(targets, route); } -void yf::Virt_db::add_map_db2target(std::string db, +void yf::VirtualDB::add_map_db2target(std::string db, std::string target, std::string route) { @@ -666,10 +681,10 @@ void yf::Virt_db::add_map_db2target(std::string db, targets.push_back(target); m_p->m_maps[mp::util::database_name_normalize(db)] - = Virt_db::Map(targets, route); + = VirtualDB::Map(targets, route); } -void yf::Virt_db::process(mp::Package &package) const +void yf::VirtualDB::process(mp::Package &package) const { FrontendPtr f = m_p->get_frontend(package); @@ -681,7 +696,7 @@ void yf::Virt_db::process(mp::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; @@ -767,7 +782,7 @@ void yf::Virt_db::process(mp::Package &package) const } -void mp::filter::Virt_db::configure(const xmlNode * ptr) +void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -783,9 +798,9 @@ void mp::filter::Virt_db::configure(const xmlNode * ptr) if (v_node->type != XML_ELEMENT_NODE) continue; - if (mp::xml::is_element_yp2(v_node, "database")) + if (mp::xml::is_element_mp(v_node, "database")) database = mp::xml::get_text(v_node); - else if (mp::xml::is_element_yp2(v_node, "target")) + else if (mp::xml::is_element_mp(v_node, "target")) targets.push_back(mp::xml::get_text(v_node)); else throw mp::filter::FilterException @@ -809,7 +824,7 @@ void mp::filter::Virt_db::configure(const xmlNode * ptr) static mp::filter::Base* filter_creator() { - return new mp::filter::Virt_db; + return new mp::filter::VirtualDB; } extern "C" { @@ -824,8 +839,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +