X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_sru_to_z3950.cpp;h=51e14fe92b141c927aa21d33c79968c026104cfa;hb=HEAD;hp=fa12345d9aeb620c00d12e5e56c57de07bed8f37;hpb=36124975217061b8fb61e5bafb18accee24dba53;p=metaproxy-moved-to-github.git diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index fa12345..51e14fe 100644 --- a/src/filter_sru_to_z3950.cpp +++ b/src/filter_sru_to_z3950.cpp @@ -30,9 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#if YAZ_VERSIONL >= 0x50000 +#include #include -#endif #include #include @@ -67,11 +66,6 @@ namespace metaproxy_1 { typedef std::map ActiveUrlMap; - boost::mutex m_url_mutex; - boost::condition m_cond_url_ready; - ActiveUrlMap m_active_urls; - - boost::mutex m_mutex_session; boost::condition m_cond_session_ready; std::map m_clients; @@ -94,6 +88,7 @@ namespace metaproxy_1 { bool z3950_search_request( mp::Package &package, + mp::Package &z3950_package, mp::odr &odr_en, Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest const *sr_req, @@ -198,7 +193,6 @@ void yf::SRUtoZ3950::Impl::sru(mp::Package &package, Z_GDU *zgdu_req) Z_SRW_PDU *sru_pdu_req = 0; mp::odr odr_en(ODR_ENCODE); - Z_SRW_PDU *sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); // determine database with the HTTP header information only mp_util::SRUServerInfo sruinfo = mp_util::get_sru_server_info(package); @@ -216,14 +210,21 @@ void yf::SRUtoZ3950::Impl::sru(mp::Package &package, Z_GDU *zgdu_req) Z_SOAP *soap = 0; char *charset = 0; const char *stylesheet = 0; + Z_SRW_diagnostic *diagnostic = 0; + int num_diagnostic = 0; // filter acts as sink for non-valid SRU requests if (! (sru_pdu_req = mp_util::decode_sru_request(package, odr_de, odr_en, - sru_pdu_res, &soap, + &diagnostic, + &num_diagnostic, &soap, charset))) { if (soap) { + Z_SRW_PDU *sru_pdu_res = yaz_srw_get(odr_en, + Z_SRW_explain_response); + sru_pdu_res->u.explain_response->diagnostics = diagnostic; + sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic; mp_util::build_sru_explain(package, odr_en, sru_pdu_res, sruinfo, explainnode); mp_util::build_sru_response(package, odr_en, soap, @@ -277,23 +278,29 @@ void yf::SRUtoZ3950::Impl::sru(mp::Package &package, Z_GDU *zgdu_req) assert(sru_pdu_req); - // filter acts as sink for SRU explain requests + Package z3950_package(package.session(), package.origin()); + z3950_package.copy_filter(package); + + Z_SRW_PDU *sru_pdu_res = 0; if (sru_pdu_req->which == Z_SRW_explain_request) { Z_SRW_explainRequest *er_req = sru_pdu_req->u.explain_request; stylesheet = er_req->stylesheet; - + sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_explain_response, + sru_pdu_req); + sru_pdu_res->u.explain_response->diagnostics = diagnostic; + sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic; mp_util::build_sru_explain(package, odr_en, sru_pdu_res, sruinfo, explainnode, er_req); } - else if (sru_pdu_req->which == Z_SRW_searchRetrieve_request - && sru_pdu_req->u.request) - { // searchRetrieve + else if (sru_pdu_req->which == Z_SRW_searchRetrieve_request) + { Z_SRW_searchRetrieveRequest *sr_req = sru_pdu_req->u.request; stylesheet = sr_req->stylesheet; - - sru_pdu_res = yaz_srw_get_pdu(odr_en, Z_SRW_searchRetrieve_response, - sru_pdu_req->srw_version); + sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_searchRetrieve_response, + sru_pdu_req); + sru_pdu_res->u.response->diagnostics = diagnostic; + sru_pdu_res->u.response->num_diagnostics = num_diagnostic; // checking that we have a query ok = mp_util::check_sru_query_exists(package, odr_en, @@ -302,7 +309,7 @@ void yf::SRUtoZ3950::Impl::sru(mp::Package &package, Z_GDU *zgdu_req) if (ok && z3950_init_request(package, odr_en, zurl, sru_pdu_res, sru_pdu_req)) { - ok = z3950_search_request(package, odr_en, + ok = z3950_search_request(package, z3950_package, odr_en, sru_pdu_res, sr_req, zurl, dbargs); if (ok @@ -315,31 +322,29 @@ void yf::SRUtoZ3950::Impl::sru(mp::Package &package, Z_GDU *zgdu_req) z3950_close_request(package); } } - - // scan - else if (sru_pdu_req->which == Z_SRW_scan_request - && sru_pdu_req->u.scan_request) + else if (sru_pdu_req->which == Z_SRW_scan_request) { - sru_pdu_res = yaz_srw_get_pdu(odr_en, Z_SRW_scan_response, - sru_pdu_req->srw_version); stylesheet = sru_pdu_req->u.scan_request->stylesheet; + sru_pdu_res = yaz_srw_get_pdu_e(odr_en, Z_SRW_scan_response, + sru_pdu_req); + sru_pdu_res->u.scan_response->diagnostics = diagnostic; + sru_pdu_res->u.scan_response->num_diagnostics = num_diagnostic; // we do not do scan at the moment, therefore issuing a diagnostic - yaz_add_srw_diagnostic(odr_en, - &(sru_pdu_res->u.scan_response->diagnostics), - &(sru_pdu_res->u.scan_response->num_diagnostics), + yaz_add_srw_diagnostic(odr_en, + &sru_pdu_res->u.scan_response->diagnostics, + &sru_pdu_res->u.scan_response->num_diagnostics, YAZ_SRW_UNSUPP_OPERATION, "scan"); } else { - sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_explain_response); - - yaz_add_srw_diagnostic(odr_en, - &(sru_pdu_res->u.explain_response->diagnostics), - &(sru_pdu_res->u.explain_response->num_diagnostics), + sru_pdu_res = + yaz_srw_get_pdu_e(odr_en, Z_SRW_explain_response, sru_pdu_req); + sru_pdu_res->u.explain_response->diagnostics = diagnostic; + sru_pdu_res->u.explain_response->num_diagnostics = num_diagnostic; + yaz_add_srw_diagnostic(odr_en, &diagnostic, &num_diagnostic, YAZ_SRW_UNSUPP_OPERATION, "unknown"); } - if (enable_package_log) { std::string l; @@ -429,33 +434,7 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request) { - if (zgdu_req->u.HTTP_Request->content_len == 0) - { - const char *path = zgdu_req->u.HTTP_Request->path; - boost::mutex::scoped_lock lock(m_url_mutex); - while (1) - { - ActiveUrlMap::iterator it = m_active_urls.find(path); - if (it == m_active_urls.end()) - { - m_active_urls[path] = 1; - break; - } - yaz_log(YLOG_LOG, "Waiting for %s to complete", path); - m_cond_url_ready.wait(lock); - } - } sru(package, zgdu_req); - if (zgdu_req && zgdu_req->u.HTTP_Request->content_len == 0) - { - const char *path = zgdu_req->u.HTTP_Request->path; - boost::mutex::scoped_lock lock(m_url_mutex); - - ActiveUrlMap::iterator it = m_active_urls.find(path); - - m_active_urls.erase(it); - m_cond_url_ready.notify_all(); - } } else { @@ -518,6 +497,19 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package, mp_util::set_vhost_otherinfo(&init_req->otherInfo, odr_en, host, 1); } + Z_GDU *zgdu_req = package.request().get(); + if (zgdu_req->which == Z_GDU_HTTP_Request) + { + Z_HTTP_Request *hreq = zgdu_req->u.HTTP_Request; + const char *peer_name = + z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For"); + if (peer_name) + { + yaz_oi_set_string_oid(&init_req->otherInfo, odr_en, + yaz_oid_userinfo_client_ip, 1, peer_name); + } + } + z3950_package.request() = apdu; // send Z3950 package @@ -579,6 +571,7 @@ bool yf::SRUtoZ3950::Impl::z3950_close_request(mp::Package &package) const } bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, + mp::Package &z3950_package, mp::odr &odr_en, Z_SRW_PDU *sru_pdu_res, Z_SRW_searchRetrieveRequest @@ -589,9 +582,6 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, assert(sru_pdu_res->u.response); - Package z3950_package(package.session(), package.origin()); - z3950_package.copy_filter(package); - Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_searchRequest); Z_SearchRequest *z_searchRequest = apdu->u.searchRequest; @@ -620,15 +610,11 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, odr_malloc(odr_en, sizeof(char *)); z_searchRequest->databaseNames[0] = odr_strdup(odr_en, db.c_str()); } -#if YAZ_VERSIONL >= 0x50000 - // yaz_oi_set_facetlist not public in YAZ 4.2.66 if (sr_req->facetList) { - Z_OtherInformation **oi = &z_searchRequest->otherInfo; + Z_OtherInformation **oi = &z_searchRequest->additionalSearchInfo; yaz_oi_set_facetlist(oi, odr_en, sr_req->facetList); } -#endif - Z_Query *z_query = (Z_Query *) odr_malloc(odr_en, sizeof(Z_Query)); z_searchRequest->query = z_query; @@ -668,12 +654,10 @@ bool yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, { return false; } -#if YAZ_VERSIONL >= 0x50000 Z_FacetList *fl = yaz_oi_get_facetlist(&sr->additionalSearchInfo); if (!fl) fl = yaz_oi_get_facetlist(&sr->otherInfo); sru_pdu_res->u.response->facetList = fl; -#endif sru_pdu_res->u.response->numberOfRecords = odr_intdup(odr_en, *sr->resultCount); return true; @@ -905,13 +889,7 @@ int yf::SRUtoZ3950::Impl::z3950_build_query( const Z_SRW_searchRetrieveRequest *req ) const { - if ( -#ifdef Z_SRW_query_type_cql - req->query_type == Z_SRW_query_type_cql -#else - !strcmp(req->queryType, "cql") -#endif - ) + if (!strcmp(req->queryType, "cql")) { Z_External *ext = (Z_External *) odr_malloc(odr_en, sizeof(*ext)); @@ -920,39 +898,21 @@ int yf::SRUtoZ3950::Impl::z3950_build_query( ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_CQL; - ext->u.cql = odr_strdup(odr_en, -#ifdef Z_SRW_query_type_cql - req->query.cql -#else - req->query -#endif - ); + ext->u.cql = odr_strdup(odr_en, req->query); z_query->which = Z_Query_type_104; z_query->u.type_104 = ext; return 0; } - if ( -#ifdef Z_SRW_query_type_pqf - req->query_type == Z_SRW_query_type_pqf -#else - !strcmp(req->queryType, "pqf") -#endif - ) + if (!strcmp(req->queryType, "pqf")) { Z_RPNQuery *RPNquery; YAZ_PQF_Parser pqf_parser; pqf_parser = yaz_pqf_create (); - RPNquery = yaz_pqf_parse (pqf_parser, odr_en, -#ifdef Z_SRW_query_type_pqf - req->query.pqf -#else - req->query -#endif - ); + RPNquery = yaz_pqf_parse (pqf_parser, odr_en, req->query); yaz_pqf_destroy(pqf_parser); if (!RPNquery) @@ -963,6 +923,15 @@ int yf::SRUtoZ3950::Impl::z3950_build_query( return 0; } + + if (!strcmp(req->queryType, "ccl")) + { + z_query->which = Z_Query_type_2; + z_query->u.type_2 = odr_create_Odr_oct(odr_en, req->query, + strlen(req->query)); + return 0; + } + return YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED; }