X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=808538ddaff26fa63e6f32eb4628fb4eda133314;hb=837411123bc29e9972ec131a90cefa22b8010022;hp=8d68ceb6a16d05347206299735533106b4ef40f0;hpb=897733ba99d2448d1d523c0c9757be714f097132;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 8d68ceb..808538d 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #include @@ -52,17 +53,21 @@ namespace metaproxy_1 { }; 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; + public: + std::string query_encoding; }; struct VirtualDB::Backend { mp::Session m_backend_session; std::list m_frontend_databases; std::list m_targets; std::string m_route; + std::string query_encoding; bool m_named_result_sets; int m_number_of_sets; }; @@ -108,6 +113,7 @@ namespace metaproxy_1 { FrontendPtr get_frontend(Package &package); void release_frontend(Package &package); + void refresh_torus(); private: std::listm_maps; typedef std::map::iterator Sets_it; @@ -175,12 +181,20 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases // see if we have a route conflict. if (!first_route && b->m_route != map_it->m_route) { - // we have a conflict.. + // 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; + if (!first_route && b->query_encoding != map_it->query_encoding) + { + // we have a conflict. query encoding must be same for all + error_code = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + BackendPtr ptr; + return ptr; + } + b->query_encoding = map_it->query_encoding; first_route = false; } return b; @@ -233,8 +247,7 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend( // we hope to get an init response error_code = YAZ_BIB1_DATABASE_UNAVAILABLE; if (gdu && gdu->which == Z_GDU_Z3950 - && gdu->u.z3950->which == Z_APDU_initResponse - && *gdu->u.z3950->u.initResponse->result) + && gdu->u.z3950->which == Z_APDU_initResponse) { Z_InitResponse *res = gdu->u.z3950->u.initResponse; if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) @@ -348,6 +361,20 @@ void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req) &req->databaseNames); } + if (b->query_encoding.length() && + (req->query->which == Z_Query_type_1 || + req->query->which == Z_Query_type_101)) + { + yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8"); + if (cd) + { + int r = yaz_query_charset_convert_rpnquery_check( + req->query->u.type_1, odr, cd); + yaz_iconv_close(cd); + if (r) + yaz_log(YLOG_LOG, "query could not be converted"); + } + } *req->replaceIndicator = 1; search_package.request() = yazpp_1::GDU(apdu_req); @@ -437,6 +464,7 @@ void yf::VirtualDB::Rep::release_frontend(mp::Package &package) } } + yf::VirtualDB::Set::Set(BackendPtr b, std::string setname) : m_backend(b), m_setname(setname) { @@ -458,6 +486,14 @@ yf::VirtualDB::Map::Map(std::string database, { } +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::VirtualDB::Map::Map() { } @@ -677,6 +713,17 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) &req->num_databaseNames, &req->databaseNames); } + + if (b->query_encoding.length()) + { + yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8"); + if (cd) + { + yaz_query_charset_convert_apt(req->termListAndStartPoint, odr, cd); + yaz_iconv_close(cd); + } + } + scan_package.request() = yazpp_1::GDU(apdu_req); scan_package.move(b->m_route); @@ -692,8 +739,8 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) void yf::VirtualDB::add_map_db2targets(std::string db, - std::list targets, - std::string route) + std::list targets, + std::string route) { m_p->m_maps.push_back( VirtualDB::Map(mp::util::database_name_normalize(db), targets, route)); @@ -701,13 +748,12 @@ void yf::VirtualDB::add_map_db2targets(std::string db, void yf::VirtualDB::add_map_db2target(std::string db, - std::string target, - std::string route) -{ - std::list targets; - targets.push_back(target); + std::string target, + std::string route) - add_map_db2targets(db, targets, route); +{ + m_p->m_maps.push_back( + VirtualDB::Map(mp::util::database_name_normalize(db), target, route)); } void yf::VirtualDB::process(mp::Package &package) const @@ -821,8 +867,8 @@ void yf::VirtualDB::process(mp::Package &package) const m_p->release_frontend(package); } - -void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) +void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only, + const char *path) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -830,10 +876,11 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) continue; if (!strcmp((const char *) ptr->name, "pass-vhosts")) { - m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false); + m_p->pass_vhosts = mp::xml::get_bool(ptr, false); } else if (!strcmp((const char *) ptr->name, "virtual")) { + std::string query_encoding; std::string database; std::list targets; xmlNode *v_node = ptr->children; @@ -846,6 +893,8 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) 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 if (mp::xml::is_element_mp(v_node, "query-encoding")) + targets.push_back(mp::xml::get_text(v_node)); else throw mp::filter::FilterException ("Bad element " @@ -854,7 +903,11 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) ); } std::string route = mp::xml::get_route(ptr); - add_map_db2targets(database, targets, route); + + VirtualDB::Map vmap(mp::util::database_name_normalize(database), + targets, route); + vmap.query_encoding = query_encoding; + m_p->m_maps.push_back(vmap); } else {