X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=fdbe8272104526c379813e6cc86e147a13c3a7e0;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=b35ed7c685141133f07f21b4c3f6991e59ac20e4;hpb=f35887e8d3cdddd8ea51e5c6a6ade1ba69225d1f;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index b35ed7c..fdbe827 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,5 +1,5 @@ -/* $Id: filter_virt_db.cpp,v 1.27 2006-01-16 16:05:50 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_virt_db.cpp,v 1.36 2006-03-16 10:40:59 adam Exp $ + Copyright (c) 2005-2006, Index Data. %LICENSE% */ @@ -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,10 +44,7 @@ namespace yp2 { std::string m_route; }; struct Virt_db::Backend { - yp2::Session m_backend_session; -#if 0 - std::string m_backend_database; -#endif + mp::Session m_backend_session; std::list m_frontend_databases; std::list m_targets; std::string m_route; @@ -56,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; @@ -73,6 +72,7 @@ namespace yp2 { std::list databases); BackendPtr create_backend_from_databases( std::list databases, + int &error_code, std::string &failing_database); BackendPtr init_backend(std::list database, @@ -82,7 +82,7 @@ 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); @@ -94,12 +94,12 @@ namespace yp2 { boost::mutex m_mutex; boost::condition m_cond_session_ready; - std::map m_clients; + std::map m_clients; }; } } -using namespace yp2; +using namespace mp; yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( std::list databases) @@ -114,7 +114,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_databases( } yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( - std::list databases, std::string &failing_database) + std::list databases, int &error_code, std::string &addinfo) { BackendPtr b(new Backend); std::list::const_iterator db_it = databases.begin(); @@ -123,6 +123,8 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( 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++) { @@ -130,7 +132,8 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( map_it = m_p->m_maps.find(*db_it); if (map_it == m_p->m_maps.end()) // database not found { - failing_database = *db_it; + error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; + addinfo = *db_it; BackendPtr ptr; return ptr; } @@ -138,19 +141,22 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( map_it->second.m_targets.begin(); for (; t_it != map_it->second.m_targets.end(); t_it++) targets_dedup[*t_it] = true; + + // see if we have a route conflict. + if (!first_route && b->m_route != map_it->second.m_route) + { + // we have a conflict.. + error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + BackendPtr ptr; + return ptr; + } 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); -#if 0 - const char *sep = strchr(b->m_vhost.c_str(), '/'); - std::string backend_database; - if (sep) - b->m_backend_database = std::string(sep+1); - else - b->m_backend_database = database; -#endif + return b; } @@ -158,30 +164,30 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( std::list databases, Package &package, int &error_code, std::string &addinfo) { - std::string failing_database; - BackendPtr b = create_backend_from_databases(databases, failing_database); + BackendPtr b = create_backend_from_databases(databases, error_code, + addinfo); if (!b) - { - error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; - addinfo = failing_database; return b; - } 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); @@ -194,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 { @@ -220,6 +225,14 @@ 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; } @@ -229,7 +242,7 @@ void yf::Virt_db::Frontend::search(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; @@ -320,10 +333,14 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) req->resultSetName = odr_strdup(odr, backend_setname.c_str()); } -#if 0 - const char *backend_database = b->m_backend_database.c_str(); - req->databaseNames[0] = odr_strdup(odr, backend_database); -#endif + // 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; @@ -333,10 +350,8 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) if (search_package.session().is_closed()) { - Z_APDU *apdu = - odr.create_searchResponse( - apdu_req, YAZ_BIB1_DATABASE_UNAVAILABLE, 0); - package.response() = apdu; + package.response() = search_package.response(); + package.session().close(); return; } package.response() = search_package.response(); @@ -374,7 +389,7 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) { boost::mutex::scoped_lock lock(m_mutex); - std::map::iterator it; + std::map::iterator it; while(true) { @@ -398,7 +413,7 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) void yf::Virt_db::Rep::release_frontend(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()) @@ -451,7 +466,7 @@ void yf::Virt_db::Frontend::present(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()) @@ -465,26 +480,23 @@ 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()); present_package.copy_filter(package); + + req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str()); - req->resultSetId = odr_strdup(odr, "default"); present_package.request() = yazpp_1::GDU(apdu_req); - present_package.move(); + present_package.move(sets_it->second.m_backend->m_route); if (present_package.session().is_closed()) { - Z_APDU *apdu = - odr.create_presentResponse( - apdu_req, - 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(); + return; } else { @@ -497,7 +509,7 @@ void yf::Virt_db::Frontend::scan(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; @@ -537,21 +549,22 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) scan_package.copy_filter(package); -#if 0 - const char *backend_database = b->m_backend_database.c_str(); - req->databaseNames[0] = odr_strdup(odr, backend_database); -#endif - + // 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); + } scan_package.request() = yazpp_1::GDU(apdu_req); scan_package.move(b->m_route); if (scan_package.session().is_closed()) { - Z_APDU *apdu = - odr.create_scanResponse( - apdu_req, YAZ_BIB1_DATABASE_UNAVAILABLE, 0); - package.response() = apdu; + package.response() = scan_package.response(); + package.session().close(); return; } package.response() = scan_package.response(); @@ -587,11 +600,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; @@ -632,7 +647,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, @@ -655,7 +670,7 @@ void yf::Virt_db::process(Package &package) const } else { - yp2::odr odr; + mp::odr odr; package.response() = odr.create_close( apdu, Z_Close_protocolError, @@ -668,7 +683,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) { @@ -684,27 +699,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); -#if 0 - std::cout << "Add " << database << "->" << target - << "," << route << "\n"; -#endif } else { - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); @@ -712,13 +723,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