X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=98ed55ac734bda8a3d4352169179ac4457efadb0;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=fa2e5a1c440b9bdfd66b06d6fc1e41aeda71b18c;hpb=e372ad52d73479587bf08a53829b1025f734bda9;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index fa2e5a1..98ed55a 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_virt_db.cpp,v 1.25 2006-01-16 01:10:19 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.33 2006-01-18 10:57:27 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -37,16 +37,15 @@ namespace yp2 { std::string m_setname; }; struct Virt_db::Map { - Map(std::string vhost, std::string route); + Map(std::list targets, std::string route); Map(); - std::string m_vhost; + std::list m_targets; std::string m_route; }; struct Virt_db::Backend { yp2::Session m_backend_session; - std::string m_backend_database; - std::string m_frontend_database; - std::string m_vhost; + std::list m_frontend_databases; + std::list m_targets; std::string m_route; bool m_named_result_sets; int m_number_of_sets; @@ -57,6 +56,7 @@ namespace yp2 { yp2::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; @@ -67,10 +67,15 @@ namespace yp2 { void close(Package &package); typedef std::map::iterator Sets_it; - BackendPtr lookup_backend_from_database(std::string database); - BackendPtr create_backend_from_database(std::string database); + 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::string database, Package &package, + BackendPtr init_backend(std::list database, + Package &package, int &error_code, std::string &addinfo); Rep *m_p; }; @@ -95,68 +100,93 @@ namespace yp2 { using namespace yp2; -yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_database( - std::string database) +yf::Virt_db::BackendPtr yf::Virt_db::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_database == database) + if ((*map_it)->m_frontend_databases == databases) return *map_it; BackendPtr null; return null; } -yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_database( - std::string database) +yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( + std::list databases, int &error_code, std::string &addinfo) { - std::map::iterator map_it; - map_it = m_p->m_maps.find(database); - if (map_it == m_p->m_maps.end()) - { - BackendPtr ptr; - return ptr; - } BackendPtr b(new Backend); + std::list::const_iterator db_it = databases.begin(); b->m_number_of_sets = 0; - b->m_frontend_database = database; + b->m_frontend_databases = databases; b->m_named_result_sets = false; - b->m_route = map_it->second.m_route; - b->m_vhost = map_it->second.m_vhost; - 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; + + bool first_route = true; + + std::map targets_dedup; + for (; db_it != databases.end(); db_it++) + { + std::map::iterator map_it; + map_it = m_p->m_maps.find(*db_it); + if (map_it == m_p->m_maps.end()) // database not found + { + error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; + 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; + + // 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); return b; } yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( - std::string database, Package &package, + std::list databases, Package &package, int &error_code, std::string &addinfo) { - BackendPtr b = create_backend_from_database(database); + BackendPtr b = create_backend_from_databases(databases, error_code, + addinfo); if (!b) - { - error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; - addinfo = database; return b; - } Package init_package(b->m_backend_session, package.origin()); init_package.copy_filter(package); yp2::odr odr; Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest); - - yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr, - VAL_PROXY, 1, b->m_vhost.c_str()); - + + yp2::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); @@ -169,32 +199,40 @@ 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; } + std::cout << "GOT INIT res=" << *res->result << "\n"; + if (!*res->result) + { + yp2::util::get_init_diagnostics(res, error_code, addinfo); + BackendPtr null; + return null; + } } else { error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; - addinfo = database; + // addinfo = database; 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; } @@ -206,17 +244,10 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) std::string resultSetId = req->resultSetName; yp2::odr odr; - // only one datatabase for now - if (req->num_databaseNames != 1) - { // exactly one database must be specified - Z_APDU *apdu = - odr.create_searchResponse( - apdu_req, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0); - package.response() = apdu; - - return; - } - std::string database = std::string(req->databaseNames[0]); + std::list databases; + int i; + for (i = 0; inum_databaseNames; i++) + databases.push_back(req->databaseNames[i]); BackendPtr b; // null for now Sets_it sets_it = m_sets.find(req->resultSetName); @@ -244,7 +275,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) for (; map_it != m_backend_list.end(); map_it++) { BackendPtr tmp = *map_it; - if (tmp->m_frontend_database == database) + if (tmp->m_frontend_databases == databases) break; } if (map_it != m_backend_list.end()) @@ -261,7 +292,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) for (; map_it != m_backend_list.end(); map_it++) { BackendPtr tmp = *map_it; - if (tmp->m_frontend_database == database && + if (tmp->m_frontend_databases == databases && (tmp->m_named_result_sets || tmp->m_number_of_sets == 0)) break; @@ -273,7 +304,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) { int error_code; std::string addinfo; - b = init_backend(database, package, error_code, addinfo); + b = init_backend(databases, package, error_code, addinfo); if (!b) { // did not get a backend (unavailable somehow?) @@ -302,8 +333,14 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) req->resultSetName = odr_strdup(odr, backend_setname.c_str()); } - const char *backend_database = b->m_backend_database.c_str(); - req->databaseNames[0] = odr_strdup(odr, backend_database); + // 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()) + { + if (!yp2::util::set_databases_from_zurl(odr, *t_it, + &req->num_databaseNames, + &req->databaseNames)); + } *req->replaceIndicator = 1; @@ -313,11 +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, database.c_str()); - package.response() = apdu; + package.response() = search_package.response(); + package.session().close(); return; } package.response() = search_package.response(); @@ -412,8 +446,8 @@ yf::Virt_db::Set::~Set() { } -yf::Virt_db::Map::Map(std::string vhost, std::string route) - : m_vhost(vhost), m_route(route) +yf::Virt_db::Map::Map(std::list targets, std::string route) + : m_targets(targets), m_route(route) { } @@ -451,21 +485,18 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) // 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 { @@ -480,18 +511,11 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) std::string vhost; yp2::odr odr; - // only one datatabase for now - if (req->num_databaseNames != 1) - { // exactly one database must be specified - Z_APDU *apdu = - odr.create_scanResponse( - apdu_req, - YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0); - package.response() = apdu; - return; - } - std::string database = std::string(req->databaseNames[0]); - + 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; @@ -499,7 +523,7 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) for (; map_it != m_backend_list.end(); map_it++) { BackendPtr tmp = *map_it; - if (tmp->m_frontend_database == database) + if (tmp->m_frontend_databases == databases) break; } if (map_it != m_backend_list.end()) @@ -508,7 +532,7 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) { int error_code; std::string addinfo; - b = init_backend(database, package, error_code, addinfo); + b = init_backend(databases, package, error_code, addinfo); if (!b) { // did not get a backend (unavailable somehow?) @@ -525,29 +549,44 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) scan_package.copy_filter(package); - const char *backend_database = b->m_backend_database.c_str(); - req->databaseNames[0] = odr_strdup(odr, backend_database); - + // 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()) + { + if (!yp2::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, database.c_str()); - package.response() = apdu; + package.response() = scan_package.response(); + package.session().close(); return; } package.response() = scan_package.response(); } -void yf::Virt_db::add_map_db2vhost(std::string db, std::string vhost, - std::string route) +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); +} + + +void yf::Virt_db::add_map_db2target(std::string db, + std::string target, + std::string route) { - m_p->m_maps[db] = Virt_db::Map(vhost, route); + std::list targets; + targets.push_back(target); + + m_p->m_maps[db] = Virt_db::Map(targets, route); } void yf::Virt_db::process(Package &package) const @@ -561,10 +600,12 @@ 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; + yp2::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts); + if (vhosts.size() == 0) { + f->m_init_gdu = gdu; + yp2::odr odr; Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0); Z_InitResponse *resp = apdu->u.initResponse; @@ -651,7 +692,7 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr) 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) { @@ -661,7 +702,7 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr) 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); + targets.push_back(yp2::xml::get_text(v_node)); else throw yp2::filter::FilterException ("Bad element " @@ -670,9 +711,7 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr) ); } std::string route = yp2::xml::get_route(ptr); - add_map_db2vhost(database, target, route); - std::cout << "Add " << database << "->" << target - << "," << route << "\n"; + add_map_db2targets(database, targets, route); } else {