From: Adam Dickmeiss Date: Tue, 29 Jan 2008 21:25:46 +0000 (+0000) Subject: The x-target SRU parameter sets both vhost and database(es). X-Git-Tag: METAPROXY.1.0.13~28 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=8ee290169373700f69f05c5dfe3ddac291c0c55c;p=metaproxy-moved-to-github.git The x-target SRU parameter sets both vhost and database(es). --- diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index 6d3b10a..db79ad7 100644 --- a/src/filter_sru_to_z3950.cpp +++ b/src/filter_sru_to_z3950.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_sru_to_z3950.cpp,v 1.36 2008-01-29 16:51:12 adam Exp $ +/* $Id: filter_sru_to_z3950.cpp,v 1.37 2008-01-29 21:25:46 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -64,7 +64,7 @@ namespace metaproxy_1 { bool z3950_init_request(mp::Package &package, mp::odr &odr_en, - Z_SRW_PDU *sru_pdu_req, + std::string zurl, Z_SRW_PDU *sru_pdu_res) const; bool z3950_close_request(mp::Package &package) const; @@ -73,7 +73,8 @@ namespace metaproxy_1 { mp::Package &package, mp::odr &odr_en, Z_SRW_PDU *sru_pdu_res, - Z_SRW_searchRetrieveRequest const *sr_req) const; + Z_SRW_searchRetrieveRequest const *sr_req, + std::string zurl) const; bool z3950_present_request( mp::Package &package, @@ -212,6 +213,16 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) return; } + std::string zurl; + Z_SRW_extra_arg *arg; + + for ( arg = sru_pdu_req->extra_args; arg; arg = arg->next) + if (!strcmp(arg->name, "x-target")) + { + zurl = std::string(arg->value); + } + + // filter acts as sink for SRU explain requests if (sru_pdu_req && sru_pdu_req->which == Z_SRW_explain_request) { @@ -233,23 +244,21 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) ok = mp_util::check_sru_query_exists(package, odr_en, sru_pdu_res, sr_req); - if (ok && z3950_init_request(package, odr_en, sru_pdu_req, sru_pdu_res)) + if (ok && z3950_init_request(package, odr_en, zurl, sru_pdu_res)) { - { - ok = z3950_search_request(package, odr_en, - sru_pdu_res, sr_req); - - if (ok - && sru_pdu_res->u.response->numberOfRecords - && *(sru_pdu_res->u.response->numberOfRecords) - && sr_req->maximumRecords - && *(sr_req->maximumRecords)) - - ok = z3950_present_request(package, odr_en, - sru_pdu_res, - sr_req); - z3950_close_request(package); - } + ok = z3950_search_request(package, odr_en, + sru_pdu_res, sr_req, zurl); + + if (ok + && sru_pdu_res->u.response->numberOfRecords + && *(sru_pdu_res->u.response->numberOfRecords) + && sr_req->maximumRecords + && *(sr_req->maximumRecords)) + + ok = z3950_present_request(package, odr_en, + sru_pdu_res, + sr_req); + z3950_close_request(package); } } @@ -269,8 +278,7 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) 4, "scan"); // to be used when we do scan - if (false && z3950_init_request(package, odr_en, sru_pdu_req, - sru_pdu_res)) + if (false && z3950_init_request(package, odr_en, zurl, sru_pdu_res)) { z3950_scan_request(package, odr_en, sru_pdu_res, sr_req); z3950_close_request(package); @@ -295,7 +303,7 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) bool yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package, mp::odr &odr_en, - Z_SRW_PDU *sru_pdu_req, + std::string zurl, Z_SRW_PDU *sru_pdu_res) const { // prepare Z3950 package @@ -321,15 +329,13 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package, ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_2); ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_3); - Z_SRW_extra_arg *arg; - for ( arg = sru_pdu_req->extra_args; arg; arg = arg->next) - if (!strcmp(arg->name, "x-target")) - { - std::string target(arg->value); - mp_util::set_vhost_otherinfo(&init_req->otherInfo, - odr_en, target, 1); - - } + if (zurl.length()) + { + std::string host; + std::list dblist; + mp_util::split_zurl(zurl, host, dblist); + mp_util::set_vhost_otherinfo(&init_req->otherInfo, odr_en, host, 1); + } z3950_package.request() = apdu; @@ -391,7 +397,8 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, mp::odr &odr_en, Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest - const *sr_req) const + const *sr_req, + std::string zurl) const { assert(sru_pdu_res->u.response); @@ -403,18 +410,22 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest); Z_SearchRequest *z_searchRequest = apdu->u.searchRequest; - // z3950'fy database - z_searchRequest->num_databaseNames = 1; - z_searchRequest->databaseNames = (char**) - odr_malloc(odr_en, sizeof(char *)); - if (sr_req->database) - z_searchRequest->databaseNames[0] - = odr_strdup(odr_en, const_cast(sr_req->database)); - else - z_searchRequest->databaseNames[0] - = odr_strdup(odr_en, "Default"); + if (!mp_util::set_databases_from_zurl(odr_en, zurl, + &z_searchRequest->num_databaseNames, + &z_searchRequest->databaseNames)) + { + z_searchRequest->num_databaseNames = 1; + z_searchRequest->databaseNames = (char**) + odr_malloc(odr_en, sizeof(char *)); + if (sr_req->database) + z_searchRequest->databaseNames[0] + = odr_strdup(odr_en, const_cast(sr_req->database)); + else + z_searchRequest->databaseNames[0] + = odr_strdup(odr_en, "Default"); + } // z3950'fy query Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query));