X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=11799d4f1092c91dbaf5b22e84fc73676ba1ac50;hb=add86f9507cafc40ff729d3afaa838e6186a86eb;hp=e2f7023556e0abca8a7130a105ad7d727e06c6af;hpb=cddf94628ebaa0856a97d02a959ab8c9939f9549;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index e2f7023..11799d4 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,130 +1,435 @@ -/* $Id: filter_virt_db.cpp,v 1.21 2006-01-12 14:09:08 adam Exp $ - Copyright (c) 2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) Index Data -%LICENSE% - */ +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" -#include "filter.hpp" -#include "package.hpp" +#include "filter_virt_db.hpp" +#include #include #include +#include -#include "util.hpp" -#include "filter_virt_db.hpp" +#include #include #include #include +#include +#include +#include #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 { - Virt_db_set(yp2::Session &id, std::string setname, - std::string vhost, std::string route, - bool named_result_sets); - Virt_db_set(); ~Virt_db_set(); - - yp2::Session m_backend_session; - std::string m_backend_setname; - std::string m_vhost; - std::string m_route; - bool m_named_result_sets; + + struct VirtualDB::Set { + Set(BackendPtr b, std::string setname); + Set(); + ~Set(); + + BackendPtr m_backend; + std::string m_setname; }; - struct Virt_db_session { - Virt_db_session(yp2::Session &id, bool use_vhost); - Virt_db_session(); - yp2::Session m_session; - bool m_use_vhost; - std::map m_sets; + struct VirtualDB::Map { + Map(std::string database, std::list targets, std::string route); + Map(std::string database, std::string target, std::string route); + Map(); + bool match(const std::string db) const; + std::string m_dbpattern; + std::list m_targets; + std::string m_route; }; - struct Virt_db_map { - Virt_db_map(std::string vhost, std::string route); - Virt_db_map(); - std::string m_vhost; + struct VirtualDB::Backend { + mp::Session m_backend_session; + std::list m_frontend_databases; + std::list m_targets; std::string m_route; + bool m_named_result_sets; + int m_number_of_sets; }; - struct Frontend { - Frontend(); + struct VirtualDB::Frontend { + Frontend(Rep *rep); ~Frontend(); - yp2::Session m_session; + mp::Session m_session; bool m_is_virtual; bool m_in_use; - std::map m_sets; - void search(Package &package, Z_APDU *apdu, - const std::map &maps); + yazpp_1::GDU m_init_gdu; + std::list m_backend_list; + 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); + int relay_apdu(Package &package, Z_APDU *apdu); + void close(Package &package); - typedef std::map::iterator Sets_it; - }; - class Virt_db::Rep { - friend class Virt_db; - - void release_session(Package &package); - void init(Package &package, Z_APDU *apdu, bool &move_later); - void search(Package &package, Z_APDU *apdu, bool &move_later); - void present(Package &package, Z_APDU *apdu, bool &move_later); - - Frontend *get_frontend(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( + std::list databases, + int &error_code, + std::string &failing_database); + + BackendPtr init_backend(std::list database, + Package &package, + int &error_code, std::string &addinfo); + Rep *m_p; + }; + class VirtualDB::Rep { + friend class VirtualDB; + friend struct Frontend; + + FrontendPtr get_frontend(Package &package); void release_frontend(Package &package); + void refresh_torus(); private: - boost::mutex m_sessions_mutex; - std::mapm_sessions; - std::mapm_maps; - - typedef std::map::iterator Ses_it; - typedef std::map::iterator Sets_it; - + std::listm_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; + bool pass_vhosts; }; } } -using namespace yp2; +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::lookup_backend_from_databases( + std::list databases) +{ + std::list::const_iterator map_it; + map_it = m_backend_list.begin(); + for (; map_it != m_backend_list.end(); map_it++) + if ((*map_it)->m_frontend_databases == databases) + return *map_it; + BackendPtr null; + return null; +} + +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases( + std::list databases, int &error_code, std::string &addinfo) +{ + BackendPtr b(new Backend); + std::list::const_iterator db_it = databases.begin(); + + b->m_number_of_sets = 0; + b->m_frontend_databases = databases; + b->m_named_result_sets = false; + + bool first_route = true; + + std::map targets_dedup; + for (; db_it != databases.end(); db_it++) + { + std::list::const_iterator map_it; + map_it = m_p->m_maps.begin(); + while (map_it != m_p->m_maps.end()) + { + if (map_it->match(*db_it)) + break; + map_it++; + } + + if (map_it == m_p->m_maps.end()) // database not found + { + error_code = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; + addinfo = *db_it; + BackendPtr ptr; + return ptr; + } + std::list::const_iterator t_it = + map_it->m_targets.begin(); + for (; t_it != map_it->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->m_route) + { + // we have a conflict.. routing must be same for all + error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + BackendPtr ptr; + return ptr; + } + b->m_route = map_it->m_route; + first_route = false; + } + return b; +} + +yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend( + std::list databases, mp::Package &package, + int &error_code, std::string &addinfo) +{ + BackendPtr b = create_backend_from_databases(databases, error_code, + addinfo); + if (!b) + return b; + Package init_package(b->m_backend_session, package.origin()); + init_package.copy_filter(package); + + mp::odr odr; + + Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest); + + 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; + + + const char *peer_name = yaz_oi_get_string_oid( + &org_init->otherInfo, yaz_oid_userinfo_client_ip, 1, 0); + if (peer_name) + yaz_oi_set_string_oid(&init_apdu->u.initRequest->otherInfo, odr, + yaz_oid_userinfo_client_ip, 1, peer_name); + + req->idAuthentication = org_init->idAuthentication; + req->implementationId = org_init->implementationId; + req->implementationName = org_init->implementationName; + req->implementationVersion = org_init->implementationVersion; + *req->preferredMessageSize = *org_init->preferredMessageSize; + *req->maximumRecordSize = *org_init->maximumRecordSize; + + ODR_MASK_SET(req->options, Z_Options_search); + ODR_MASK_SET(req->options, Z_Options_present); + ODR_MASK_SET(req->options, Z_Options_namedResultSets); + ODR_MASK_SET(req->options, Z_Options_scan); + + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + + init_package.request() = init_apdu; + + init_package.move(b->m_route); // sending init + + Z_GDU *gdu = init_package.response().get(); + // we hope to get an init response + error_code = 0; + if (gdu && gdu->which == Z_GDU_Z3950 + && gdu->u.z3950->which == Z_APDU_initResponse) + { + 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 && !init_package.session().is_closed()) + { + m_backend_list.push_back(b); + return b; + } + mp::util::get_init_diagnostics(res, error_code, addinfo); + } + if (error_code == 0) + { + std::list::const_iterator db_it = databases.begin(); + error_code = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED; + if (db_it != databases.end()) + addinfo = *db_it; + } + if (!init_package.session().is_closed()) + { + Package close_package(b->m_backend_session, package.origin()); + close_package.copy_filter(package); + close_package.session().close(); + close_package.move(b->m_route); // closing it + } + BackendPtr null; + return null; +} + +void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req) +{ + yazpp_1::GDU ngdu(apdu_req); + Z_SearchRequest *req = ngdu.get()->u.z3950->u.searchRequest; + std::string vhost; + std::string resultSetId = req->resultSetName; + mp::odr odr; + + std::list databases; + int i; + for (i = 0; inum_databaseNames; i++) + databases.push_back(req->databaseNames[i]); + + Sets_it sets_it = m_sets.find(req->resultSetName); + if (sets_it != m_sets.end()) + { + // result set already exist + // if replace indicator is off: we return diagnostic if + // result set already exist. + if (*req->replaceIndicator == 0) + { + Z_APDU *apdu = + odr.create_searchResponse( + apdu_req, + YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF, + 0); + package.response() = apdu; + + return; + } + sets_it->second.m_backend->m_number_of_sets--; + } + // pick up any existing database with named result sets .. + // or one which has no result sets.. yet. + BackendPtr b; // null for now + std::list::const_iterator map_it; + map_it = m_backend_list.begin(); + for (; map_it != m_backend_list.end(); map_it++) + { + BackendPtr tmp = *map_it; + if (tmp->m_frontend_databases == databases && + (tmp->m_named_result_sets || + tmp->m_number_of_sets == 0)) + { + b = *map_it; + break; + } + } + if (!b) // no backend yet. Must create a new one + { + int error_code; + std::string addinfo; + b = init_backend(databases, package, error_code, addinfo); + if (!b) + { + // did not get a backend (unavailable somehow?) + + Z_APDU *apdu = + odr.create_searchResponse( + apdu_req, error_code, addinfo.c_str()); + package.response() = apdu; + return; + } + } + m_sets.erase(req->resultSetName); + // sending search to backend + Package search_package(b->m_backend_session, package.origin()); + + search_package.copy_filter(package); + + std::string backend_setname; + if (b->m_named_result_sets) + { + backend_setname = std::string(req->resultSetName); + } + else + { + backend_setname = "default"; + req->resultSetName = odr_strdup(odr, backend_setname.c_str()); + } + + // pick first targets spec and move the databases from it .. + std::list::const_iterator t_it = b->m_targets.begin(); + if (t_it != b->m_targets.end()) + { + mp::util::set_databases_from_zurl(odr, *t_it, + &req->num_databaseNames, + &req->databaseNames); + } + + *req->replaceIndicator = 1; + + search_package.request() = ngdu; + + search_package.move(b->m_route); + + if (search_package.session().is_closed()) + { + package.response() = search_package.response(); + package.session().close(); + return; + } + + Z_GDU *gdu = search_package.response().get(); + if (gdu && gdu->which == Z_GDU_Z3950 + && gdu->u.z3950->which == Z_APDU_searchResponse) + { + Z_SearchResponse *b_resp = gdu->u.z3950->u.searchResponse; + Z_Records *z_records = b_resp->records; + if (!z_records || (z_records && z_records->which == Z_Records_DBOSD)) + { + b->m_number_of_sets++; + m_sets[resultSetId] = VirtualDB::Set(b, backend_setname); + fixup_package(search_package, b); + } + } + package.response() = search_package.response(); +} -yf::Frontend::Frontend() +yf::VirtualDB::Frontend::Frontend(Rep *rep) { + m_p = rep; m_is_virtual = false; } -void yf::Frontend::close(Package &package) +void yf::VirtualDB::Frontend::close(mp::Package &package) { - Sets_it sit = m_sets.begin(); - for (; sit != m_sets.end(); sit++) + std::list::const_iterator b_it; + + for (b_it = m_backend_list.begin(); b_it != m_backend_list.end(); b_it++) { - sit->second.m_backend_session.close(); - Package close_package(sit->second.m_backend_session, package.origin()); + (*b_it)->m_backend_session.close(); + Package close_package((*b_it)->m_backend_session, package.origin()); close_package.copy_filter(package); - - close_package.move(sit->second.m_route); + close_package.move((*b_it)->m_route); } + m_backend_list.clear(); } -yf::Frontend::~Frontend() +yf::VirtualDB::Frontend::~Frontend() { } -yf::Frontend *yf::Virt_db::Rep::get_frontend(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) { it = m_clients.find(package.session()); if (it == m_clients.end()) break; - + if (!it->second->m_in_use) { it->second->m_in_use = true; @@ -132,25 +437,23 @@ yf::Frontend *yf::Virt_db::Rep::get_frontend(Package &package) } m_cond_session_ready.wait(lock); } - Frontend *f = new Frontend; + FrontendPtr f(new Frontend(this)); m_clients[package.session()] = f; f->m_in_use = true; return f; } - -void yf::Virt_db::Rep::release_frontend(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()) { if (package.session().is_closed()) { it->second->close(package); - delete it->second; m_clients.erase(it); } else @@ -161,201 +464,174 @@ void yf::Virt_db::Rep::release_frontend(Package &package) } } -yf::Virt_db_set::Virt_db_set(yp2::Session &id, std::string setname, - std::string vhost, std::string route, - bool named_result_sets) - : m_backend_session(id), m_backend_setname(setname), m_vhost(vhost), - m_route(route), m_named_result_sets(named_result_sets) + +yf::VirtualDB::Set::Set(BackendPtr b, std::string setname) + : m_backend(b), m_setname(setname) { } -yf::Virt_db_set::Virt_db_set() +yf::VirtualDB::Set::Set() { } -yf::Virt_db_set::~Virt_db_set() +yf::VirtualDB::Set::~Set() { } -yf::Virt_db_map::Virt_db_map(std::string vhost, std::string route) - : m_vhost(vhost), m_route(route) +yf::VirtualDB::Map::Map(std::string database, + std::list targets, std::string route) + : m_dbpattern(database), m_targets(targets), m_route(route) { } -yf::Virt_db_map::Virt_db_map() +yf::VirtualDB::Map::Map(std::string database, + std::string target, std::string route) + : m_dbpattern(database), m_route(route) { + m_targets.push_back(target); } -yf::Virt_db_session::Virt_db_session() - : m_use_vhost(false) -{ +yf::VirtualDB::Map::Map() +{ } -yf::Virt_db_session::Virt_db_session(yp2::Session &id, - bool use_vhost) : - m_session(id) , m_use_vhost(use_vhost) +bool yf::VirtualDB::Map::match(const std::string db) const { - + std::string norm_db = mp::util::database_name_normalize(db); + if (yaz_match_glob(m_dbpattern.c_str(), norm_db.c_str())) + return true; + return false; } -yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep) +yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep) { + m_p->pass_vhosts = false; } -yf::Virt_db::~Virt_db() { +yf::VirtualDB::~VirtualDB() { } -void yf::Virt_db::Rep::release_session(Package &package) +void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr, + BackendPtr b) { - boost::mutex::scoped_lock lock(m_sessions_mutex); - - Ses_it it = m_sessions.find(package.session()); - - if (it != m_sessions.end()) + if (npr->databaseName) { - Sets_it sit = it->second.m_sets.begin(); - for (; sit != it->second.m_sets.end(); sit++) + 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++) { - sit->second.m_backend_session.close(); - Package close_package(sit->second.m_backend_session, package.origin()); - close_package.copy_filter(package); + // see which target it corresponds to.. (if any) + std::list::const_iterator map_it = + m_p->m_maps.begin(); + while (map_it != m_p->m_maps.end()) + { + if (map_it->match(*db_it)) + break; + map_it++; + } + if (map_it != m_p->m_maps.end()) + { + std::list::const_iterator t + = map_it->m_targets.begin(); + while (t != map_it->m_targets.end()) + { + if (*t == b_database) + { + npr->databaseName = odr_strdup(odr, (*db_it).c_str()); + return; + } + t++; + } + } - close_package.move(sit->second.m_route); + } + 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()); } } - m_sessions.erase(package.session()); } -void yf::Virt_db::Rep::present(Package &package, Z_APDU *apdu, bool &move_later){ - Session *id = 0; - Z_PresentRequest *req = apdu->u.presentRequest; - std::string resultSetId = req->resultSetId; - yp2::odr odr; +void yf::VirtualDB::Frontend::fixup_npr_records(ODR odr, Z_Records *records, + BackendPtr b) +{ + if (records && records->which == Z_Records_DBOSD) { - boost::mutex::scoped_lock lock(m_sessions_mutex); - - Ses_it it = m_sessions.find(package.session()); - if (it == m_sessions.end()) - { - package.response() = odr.create_close( - Z_Close_protocolError, - "no session for present request"); - package.session().close(); - return; - } - if (it->second.m_use_vhost) - { - move_later = true; - return; - } - Sets_it sets_it = it->second.m_sets.find(resultSetId); - if (sets_it == it->second.m_sets.end()) + Z_NamePlusRecordList *nprlist = records->u.databaseOrSurDiagnostics; + int i; + for (i = 0; i < nprlist->num_records; i++) { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.presentResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, - YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, - resultSetId.c_str()); - package.response() = apdu; - - return; + fixup_npr_record(odr, nprlist->records[i], b); } - id = new yp2::Session(sets_it->second.m_backend_session); } - - // sending present to backend - Package present_package(*id, package.origin()); - present_package.copy_filter(package); - - req->resultSetId = odr_strdup(odr, "default"); - present_package.request() = yazpp_1::GDU(apdu); +} - present_package.move(); +void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b) +{ + Z_GDU *gdu = p.response().get(); + mp::odr odr; - if (present_package.session().is_closed()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.presentResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, - YAZ_BIB1_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_, - resultSetId.c_str()); - package.response() = apdu; - - boost::mutex::scoped_lock lock(m_sessions_mutex); - Ses_it it = m_sessions.find(package.session()); - if (it != m_sessions.end()) - it->second.m_sets.erase(resultSetId); - } - else + if (gdu && gdu->which == Z_GDU_Z3950) { - package.response() = present_package.response(); + 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; + } } - delete id; } -void yf::Frontend::present(Package &package, Z_APDU *apdu) +void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req) { - Session *id = 0; - Z_PresentRequest *req = apdu->u.presentRequest; + yazpp_1::GDU ngdu(apdu_req); + Z_PresentRequest *req = ngdu.get()->u.z3950->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()) { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.presentResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, + Z_APDU *apdu = + odr.create_presentResponse( + apdu_req, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, resultSetId.c_str()); package.response() = apdu; - return; } - id = new yp2::Session(sets_it->second.m_backend_session); - + Session *id = + new mp::Session(sets_it->second.m_backend->m_backend_session); + // sending present to backend Package present_package(*id, package.origin()); present_package.copy_filter(package); - - req->resultSetId = odr_strdup(odr, "default"); - present_package.request() = yazpp_1::GDU(apdu); - present_package.move(); + req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str()); + + present_package.request() = ngdu; + + 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()) { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.presentResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, - YAZ_BIB1_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_, - resultSetId.c_str()); - package.response() = apdu; - - m_sets.erase(resultSetId); + package.response() = present_package.response(); + package.session().close(); } else { @@ -364,564 +640,279 @@ void yf::Frontend::present(Package &package, Z_APDU *apdu) delete id; } -void yf::Virt_db::Rep::search(Package &package, Z_APDU *apdu, bool &move_later) +int yf::VirtualDB::Frontend::relay_apdu(mp::Package &package, Z_APDU *apdu_req) { - Z_SearchRequest *req = apdu->u.searchRequest; - std::string vhost; - std::string database; - std::string resultSetId = req->resultSetName; - std::string route; - bool support_named_result_sets = false; // whether backend supports it - yp2::odr odr; + int no = 0; + std::list::const_iterator map_it; + map_it = m_backend_list.begin(); + for (; map_it != m_backend_list.end(); map_it++) { - boost::mutex::scoped_lock lock(m_sessions_mutex); + BackendPtr b = *map_it; - Ses_it it = m_sessions.find(package.session()); - if (it == m_sessions.end()) - { - package.response() = odr.create_close( - Z_Close_protocolError, - "no session for search request"); - package.session().close(); + Package relay_package(b->m_backend_session, package.origin()); + relay_package.copy_filter(package); - return; - } - if (it->second.m_use_vhost) - { - move_later = true; - return; - } - if (req->num_databaseNames != 1) - { // exactly one database must be specified - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0); - package.response() = apdu; - - return; - } - database = req->databaseNames[0]; - std::map::iterator map_it; - map_it = m_maps.find(database); - if (map_it == m_maps.end()) - { // no map for database: return diagnostic - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, database.c_str()); - package.response() = apdu; - - return; - } - if (*req->replaceIndicator == 0) - { - Sets_it sets_it = it->second.m_sets.find(req->resultSetName); - if (sets_it != it->second.m_sets.end()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, - YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF, - 0); - package.response() = apdu; - - return; - } - } - it->second.m_sets.erase(req->resultSetName); - vhost = map_it->second.m_vhost; - route = map_it->second.m_route; - } - // we might look for an existing session with same vhost - Session id; - const char *vhost_cstr = vhost.c_str(); - if (true) - { // sending init to backend - Package init_package(id, package.origin()); - init_package.copy_filter(package); - - Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest); - - yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr, - VAL_PROXY, 1, vhost_cstr); - - init_package.request() = init_apdu; - - init_package.move(route); // sending init - - if (init_package.session().is_closed()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); - package.response() = apdu; - } - 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)) - support_named_result_sets = true; - } - else - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); - package.response() = apdu; - - return; - } - } - // sending search to backend - Package search_package(id, package.origin()); + relay_package.request() = yazpp_1::GDU(apdu_req); - search_package.copy_filter(package); - const char *sep = strchr(vhost_cstr, '/'); - if (sep) - req->databaseNames[0] = odr_strdup(odr, sep+1); - - *req->replaceIndicator = 1; - - std::string backend_resultSetId = "default"; - req->resultSetName = odr_strdup(odr, backend_resultSetId.c_str()); - search_package.request() = yazpp_1::GDU(apdu); - - search_package.move(route); - - if (search_package.session().is_closed()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); - package.response() = apdu; - - return; + relay_package.move(b->m_route); + package.response() = relay_package.response(); + no++; } - package.response() = search_package.response(); - - boost::mutex::scoped_lock lock(m_sessions_mutex); - Ses_it it = m_sessions.find(package.session()); - if (it != m_sessions.end()) - it->second.m_sets[resultSetId] = - Virt_db_set(id, backend_resultSetId, vhost, route, - support_named_result_sets); + return no; } -void yf::Frontend::search(Package &package, Z_APDU *apdu, - const std::map &maps) +void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) { - Z_SearchRequest *req = apdu->u.searchRequest; + yazpp_1::GDU ngdu(apdu_req); + Z_ScanRequest *req = ngdu.get()->u.z3950->u.scanRequest; std::string vhost; - std::string database; - std::string resultSetId = req->resultSetName; - bool support_named_result_sets = false; // whether backend supports it - yp2::odr odr; - - if (req->num_databaseNames != 1) - { // exactly one database must be specified - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0); - package.response() = apdu; - - return; - } - database = req->databaseNames[0]; - std::map::const_iterator map_it; - map_it = maps.find(database); - if (map_it == maps.end()) - { // no map for database: return diagnostic - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, database.c_str()); - package.response() = apdu; - - return; - } - if (*req->replaceIndicator == 0) + mp::odr odr; + + std::list databases; + int i; + for (i = 0; inum_databaseNames; i++) + databases.push_back(req->databaseNames[i]); + + BackendPtr b; + // pick up any existing backend with a database match + std::list::const_iterator map_it; + map_it = m_backend_list.begin(); + for (; map_it != m_backend_list.end(); map_it++) { - Sets_it sets_it = m_sets.find(req->resultSetName); - if (sets_it != m_sets.end()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, - YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF, - 0); - package.response() = apdu; - - return; - } + BackendPtr tmp = *map_it; + if (tmp->m_frontend_databases == databases) + break; } - m_sets.erase(req->resultSetName); - vhost = map_it->second.m_vhost; - std::string route = map_it->second.m_route; - // we might look for an existing session with same vhost - Session id; - const char *vhost_cstr = vhost.c_str(); - if (true) - { // sending init to backend - Package init_package(id, package.origin()); - init_package.copy_filter(package); - - Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest); - - yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr, - VAL_PROXY, 1, vhost_cstr); - - init_package.request() = init_apdu; - - init_package.move(route); // sending init - - if (init_package.session().is_closed()) - { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); - package.response() = apdu; - } - 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)) - support_named_result_sets = true; - } - else + if (map_it != m_backend_list.end()) + b = *map_it; + if (!b) // no backend yet. Must create a new one + { + int error_code; + std::string addinfo; + b = init_backend(databases, package, error_code, addinfo); + if (!b) { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); + // did not get a backend (unavailable somehow?) + Z_APDU *apdu = + odr.create_scanResponse( + apdu_req, error_code, addinfo.c_str()); package.response() = apdu; - + return; } } - // sending search to backend - Package search_package(id, package.origin()); + // sending scan to backend + Package scan_package(b->m_backend_session, package.origin()); - search_package.copy_filter(package); - const char *sep = strchr(vhost_cstr, '/'); - if (sep) - req->databaseNames[0] = odr_strdup(odr, sep+1); + scan_package.copy_filter(package); - *req->replaceIndicator = 1; + // pick first targets spec and move the databases from it .. + std::list::const_iterator t_it = b->m_targets.begin(); + if (t_it != b->m_targets.end()) + { + mp::util::set_databases_from_zurl(odr, *t_it, + &req->num_databaseNames, + &req->databaseNames); + } - std::string backend_resultSetId = "default"; - req->resultSetName = odr_strdup(odr, backend_resultSetId.c_str()); - search_package.request() = yazpp_1::GDU(apdu); - - search_package.move(route); + scan_package.request() = ngdu; - if (search_package.session().is_closed()) + scan_package.move(b->m_route); + + if (scan_package.session().is_closed()) { - Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchResponse); - - Z_Records *rec = (Z_Records *) odr_malloc(odr, sizeof(Z_Records)); - apdu->u.searchResponse->records = rec; - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = - zget_DefaultDiagFormat( - odr, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str()); - package.response() = apdu; - + package.response() = scan_package.response(); + package.session().close(); return; } - package.response() = search_package.response(); - - m_sets[resultSetId] = - Virt_db_set(id, backend_resultSetId, vhost, route, - support_named_result_sets); + package.response() = scan_package.response(); } -void yf::Virt_db::Rep::init(Package &package, Z_APDU *apdu, bool &move_later) -{ - release_session(package); - boost::mutex::scoped_lock lock(m_sessions_mutex); - - Z_InitRequest *req = apdu->u.initRequest; - - const char *vhost = - yaz_oi_get_string_oidval(&req->otherInfo, VAL_PROXY, 1, 0); - if (!vhost) - { - yp2::odr odr; - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); - Z_InitResponse *resp = apdu->u.initResponse; - - int i; - static const int masks[] = { - Z_Options_search, Z_Options_present, Z_Options_namedResultSets, -1 - }; - for (i = 0; masks[i] != -1; i++) - if (ODR_MASK_GET(req->options, masks[i])) - ODR_MASK_SET(resp->options, masks[i]); - - static const int versions[] = { - Z_ProtocolVersion_1, - Z_ProtocolVersion_2, - Z_ProtocolVersion_3, - -1 - }; - for (i = 0; versions[i] != -1; i++) - if (ODR_MASK_GET(req->protocolVersion, versions[i])) - ODR_MASK_SET(resp->protocolVersion, versions[i]); - else - break; - package.response() = apdu; - - m_sessions[package.session()] = Virt_db_session(package.session(), false); - } - else - { - m_sessions[package.session()] = Virt_db_session(package.session(), true); - package.move(); - } +void yf::VirtualDB::add_map_db2targets(std::string db, + std::list targets, + std::string route) +{ + m_p->m_maps.push_back( + VirtualDB::Map(mp::util::database_name_normalize(db), targets, route)); } -void yf::Virt_db::add_map_db2vhost(std::string db, std::string vhost, - std::string route) + +void yf::VirtualDB::add_map_db2target(std::string db, + std::string target, + std::string route) + { - m_p->m_maps[db] = Virt_db_map(vhost, route); + m_p->m_maps.push_back( + VirtualDB::Map(mp::util::database_name_normalize(db), target, route)); } -#if 0 -void yf::Virt_db::process(Package &package) const +void yf::VirtualDB::process(mp::Package &package) const { - yf::Frontend *f = m_p->get_frontend(package); - if (f) + FrontendPtr f = m_p->get_frontend(package); + + Z_GDU *gdu = package.request().get(); + + if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == + Z_APDU_initRequest && !f->m_is_virtual) { - Z_GDU *gdu = package.request().get(); - - if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == - Z_APDU_initRequest) + Z_InitRequest *req = gdu->u.z3950->u.initRequest; + + std::list vhosts; + mp::util::get_vhost_otherinfo(req->otherInfo, vhosts); + + if (vhosts.size() > 0 && m_p->pass_vhosts) { - Z_InitRequest *req = gdu->u.z3950->u.initRequest; - - const char *vhost = - yaz_oi_get_string_oidval(&req->otherInfo, VAL_PROXY, 1, 0); - if (!vhost) - { - yp2::odr odr; - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); - Z_InitResponse *resp = apdu->u.initResponse; - - int i; - static const int masks[] = { - Z_Options_search, - Z_Options_present, - Z_Options_namedResultSets, - -1 - }; - for (i = 0; masks[i] != -1; i++) - if (ODR_MASK_GET(req->options, masks[i])) - ODR_MASK_SET(resp->options, masks[i]); - - static const int versions[] = { - Z_ProtocolVersion_1, - Z_ProtocolVersion_2, - Z_ProtocolVersion_3, - -1 - }; - for (i = 0; versions[i] != -1; i++) - if (ODR_MASK_GET(req->protocolVersion, versions[i])) - ODR_MASK_SET(resp->protocolVersion, versions[i]); - else - break; - - package.response() = apdu; - f->m_is_virtual = true; - } - else - package.move(); - } - else if (!f->m_is_virtual) package.move(); - else if (gdu && gdu->which == Z_GDU_Z3950) + } + else { - Z_APDU *apdu = gdu->u.z3950; - if (apdu->which == Z_APDU_initRequest) - { - } - else if (apdu->which == Z_APDU_searchRequest) - { - f->search(package, apdu, m_p->m_maps); - } - else if (apdu->which == Z_APDU_presentRequest) - { - f->present(package, apdu); - } - else - { - yp2::odr odr; - - package.response() = odr.create_close( - Z_Close_protocolError, - "unsupported APDU in filter_virt_db"); - - package.session().close(); - } + 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; + + int i; + static const int masks[] = { + Z_Options_search, + Z_Options_present, + Z_Options_namedResultSets, + Z_Options_scan, + -1 + }; + for (i = 0; masks[i] != -1; i++) + if (ODR_MASK_GET(req->options, masks[i])) + ODR_MASK_SET(resp->options, masks[i]); + + static const int versions[] = { + Z_ProtocolVersion_1, + Z_ProtocolVersion_2, + Z_ProtocolVersion_3, + -1 + }; + for (i = 0; versions[i] != -1; i++) + if (ODR_MASK_GET(req->protocolVersion, versions[i])) + ODR_MASK_SET(resp->protocolVersion, versions[i]); + else + break; + + *resp->preferredMessageSize = *req->preferredMessageSize; + *resp->maximumRecordSize = *req->maximumRecordSize; + + package.response() = apdu; + f->m_is_virtual = true; } } - m_p->release_frontend(package); -} - -#else -void yf::Virt_db::process(Package &package) const -{ - Z_GDU *gdu = package.request().get(); - - if (package.session().is_closed()) - m_p->release_session(package); - else if (!gdu || gdu->which != Z_GDU_Z3950) + else if (!f->m_is_virtual) package.move(); - else + else if (gdu && gdu->which == Z_GDU_Z3950) { - bool move_later = false; Z_APDU *apdu = gdu->u.z3950; if (apdu->which == Z_APDU_initRequest) { - m_p->init(package, apdu, move_later); + mp::odr odr; + + package.response() = odr.create_close( + apdu, + Z_Close_protocolError, + "double init"); + + package.session().close(); } else if (apdu->which == Z_APDU_searchRequest) { - m_p->search(package, apdu, move_later); + f->search(package, apdu); } else if (apdu->which == Z_APDU_presentRequest) { - m_p->present(package, apdu, move_later); + f->present(package, apdu); + } + else if (apdu->which == Z_APDU_scanRequest) + { + f->scan(package, apdu); } else if (apdu->which == Z_APDU_close) { - package.session().close(); - m_p->release_session(package); + if (f->relay_apdu(package, apdu) == 0) + { + mp::odr odr; + + package.response() = odr.create_close( + apdu, Z_Close_finished, "virt_db"); + + package.session().close(); + } } else { - yp2::odr odr; - + mp::odr odr; + package.response() = odr.create_close( - Z_Close_protocolError, + apdu, Z_Close_protocolError, "unsupported APDU in filter_virt_db"); - + package.session().close(); - m_p->release_session(package); } - if (move_later) - package.move(); } + m_p->release_frontend(package); } -#endif -void yp2::filter::Virt_db::configure(const xmlNode * ptr) +void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only, + const char *path) { for (ptr = ptr->children; ptr; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) continue; - if (!strcmp((const char *) ptr->name, "virtual")) + if (!strcmp((const char *) ptr->name, "pass-vhosts")) + { + m_p->pass_vhosts = mp::xml::get_bool(ptr, false); + } + else if (!strcmp((const char *) ptr->name, "virtual")) { std::string database; - std::string target; + std::list targets; xmlNode *v_node = ptr->children; for (; v_node; v_node = v_node->next) { 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")) - target = yp2::xml::get_text(v_node); + + if (mp::xml::is_element_mp(v_node, "database")) + database = mp::xml::get_text(v_node); + else if (mp::xml::is_element_mp(v_node, "target")) + targets.push_back(mp::xml::get_text(v_node)); else - throw yp2::filter::FilterException - ("Bad element " + throw mp::filter::FilterException + ("Bad element " + std::string((const char *) v_node->name) + " in virtual section" ); } - std::string route = yp2::xml::get_route(ptr); - add_map_db2vhost(database, target, route); - std::cout << "Add " << database << "->" << target - << "," << route << "\n"; + std::string route = mp::xml::get_route(ptr); + + VirtualDB::Map vmap(mp::util::database_name_normalize(database), + targets, route); + m_p->m_maps.push_back(vmap); } else { - throw yp2::filter::FilterException - ("Bad element " + throw mp::filter::FilterException + ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); } } } -static yp2::filter::Base* filter_creator() +static mp::filter::Base* filter_creator() { - return new yp2::filter::Virt_db; + return new mp::filter::VirtualDB; } 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 @@ -932,8 +923,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 */ +