X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_sru_to_z3950.cpp;h=65264b0c8722abda207fd8eb6ccd399c9c5443e4;hb=1615e9726fe4457ef6efea73f0d1bed70b18342d;hp=f1a18a273eff6cfffb9e8aa8a717d65617c8e923;hpb=cac118fe88baae4092e18e55736e173d44aa7ad7;p=metaproxy-moved-to-github.git diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp index f1a18a2..65264b0 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.19 2006-10-02 13:44:48 marc Exp $ +/* $Id: filter_sru_to_z3950.cpp,v 1.21 2006-10-03 12:31:26 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details @@ -22,7 +22,7 @@ #include #include #include - +#include namespace mp = metaproxy_1; namespace mp_util = metaproxy_1::util; @@ -41,9 +41,9 @@ namespace metaproxy_1 { private: //std::string sru_protocol(const Z_HTTP_Request &http_req) const; std::string debug_http(const Z_HTTP_Request &http_req) const; - void http_response(mp::Package &package, - const std::string &content, - int http_code = 200) const; + //void http_response(mp::Package &package, + // const std::string &content, + // int http_code = 200) const; bool build_sru_debug_package(mp::Package &package) const; bool build_simple_explain(mp::Package &package, mp::odr &odr_en, @@ -218,7 +218,14 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package) const sru_pdu_res = yaz_srw_get(odr_en, Z_SRW_scan_response); - if (z3950_init_request(package)) + // 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), + 4, "scan"); + + // to be used when we do scan + if (false && z3950_init_request(package)) { z3950_scan_request(package, odr_en, sru_pdu_res, sr_req); z3950_close_request(package); @@ -325,7 +332,7 @@ bool yf::SRUtoZ3950::Impl::build_sru_debug_package(mp::Package &package) const Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request; std::string content = mp_util::http_headers_debug(*http_req); int http_code = 400; - http_response(package, content, http_code); + mp_util::http_response(package, content, http_code); return true; } package.session().close(); @@ -584,6 +591,9 @@ yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, Z_SRW_searchRetrieveRequest const *sr_req) const { + + assert(sru_pdu_res->u.response); + Package z3950_package(package.session(), package.origin()); z3950_package.copy_filter(package); @@ -612,7 +622,10 @@ yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package, (const SRW_query&)sr_req->query, sr_req->query_type)) { - //send_to_srw_client_error(7, "query"); + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 7, "query"); return false; } @@ -665,6 +678,7 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, const *sr_req) const { + assert(sru_pdu_res->u.response); if (!sr_req) return false; @@ -674,13 +688,6 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, if (!(sr_req->maximumRecords) || 0 == *(sr_req->maximumRecords)) return true; - // creating Z3950 package - Package z3950_package(package.session(), package.origin()); - z3950_package.copy_filter(package); - Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest); - - assert(apdu->u.presentRequest); - bool send_z3950_present = true; // recordXPath unsupported. @@ -714,12 +721,16 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, 80, 0); } - // start record requested larger than number of records + // start record requested negative, or larger than number of records if (sr_req->startRecord - && sru_pdu_res->u.response->numberOfRecords - && *(sr_req->startRecord) > *(sru_pdu_res->u.response->numberOfRecords)) + && + ((*(sr_req->startRecord) < 0) // negative + || + (sru_pdu_res->u.response->numberOfRecords //out of range + && *(sr_req->startRecord) + > *(sru_pdu_res->u.response->numberOfRecords)) + )) { - // = *(sr_req->startRecord); send_z3950_present = false; yaz_add_srw_diagnostic(odr_en, &(sru_pdu_res->u.response->diagnostics), @@ -727,11 +738,28 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, 61, 0); } + // maximumRecords requested negative + if (sr_req->maximumRecords + && *(sr_req->maximumRecords) < 0) + + { + send_z3950_present = false; + yaz_add_srw_diagnostic(odr_en, + &(sru_pdu_res->u.response->diagnostics), + &(sru_pdu_res->u.response->num_diagnostics), + 6, "maximumRecords"); + } + // exit on all these above diagnostics if (!send_z3950_present) return false; // now packaging the z3950 present request + Package z3950_package(package.session(), package.origin()); + z3950_package.copy_filter(package); + Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest); + + assert(apdu->u.presentRequest); // z3950'fy start record position if (sr_req->startRecord) @@ -741,9 +769,13 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, *(apdu->u.presentRequest->resultSetStartPoint) = 1; // z3950'fy number of records requested + // protect against requesting records out of range if (sr_req->maximumRecords) *(apdu->u.presentRequest->numberOfRecordsRequested) - = *(sr_req->maximumRecords); + = std::min(*(sr_req->maximumRecords), + *(sru_pdu_res->u.response->numberOfRecords) + - *(apdu->u.presentRequest->resultSetStartPoint) + + 1); // z3950'fy recordPacking int record_packing = Z_SRW_recordPacking_XML; @@ -758,11 +790,13 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, if (sr_req->recordSchema) { apdu->u.presentRequest->recordComposition - = (Z_RecordComposition *) odr_malloc(odr_en, sizeof(Z_RecordComposition)); + = (Z_RecordComposition *) + odr_malloc(odr_en, sizeof(Z_RecordComposition)); apdu->u.presentRequest->recordComposition->which = Z_RecordComp_simple; apdu->u.presentRequest->recordComposition->u.simple - = build_esn_from_schema(odr_en, (const char *) sr_req->recordSchema); + = build_esn_from_schema(odr_en, + (const char *) sr_req->recordSchema); } // z3950'fy time to live - flagged as diagnostics above @@ -802,7 +836,8 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, && pr->records->u.nonSurrogateDiagnostic) { //int http_code = - z3950_to_srw_diag(odr_en, sru_res, pr->records->u.nonSurrogateDiagnostic); + z3950_to_srw_diag(odr_en, sru_res, + pr->records->u.nonSurrogateDiagnostic); return false; } @@ -815,13 +850,19 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, sru_res->records = (Z_SRW_record *) odr_malloc(odr_en, - sru_res->num_records *sizeof(Z_SRW_record)); + sru_res->num_records + * sizeof(Z_SRW_record)); + // srw'fy nextRecordPosition - if (pr->nextResultSetPosition) + // next position never zero or behind the last z3950 record + if (pr->nextResultSetPosition + && *(pr->nextResultSetPosition) > 0 + && *(pr->nextResultSetPosition) + <= *(sru_pdu_res->u.response->numberOfRecords)) sru_res->nextRecordPosition = odr_intdup(odr_en, *(pr->nextResultSetPosition)); - + // inserting all records for (int i = 0; i < sru_res->num_records; i++) { @@ -829,7 +870,8 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package, = pr->records->u.databaseOrSurDiagnostics->records[i]; sru_res->records[i].recordPosition - = odr_intdup(odr_en, i + *(apdu->u.presentRequest->resultSetStartPoint)); + = odr_intdup(odr_en, + i + *(apdu->u.presentRequest->resultSetStartPoint)); sru_res->records[i].recordPacking = record_packing; @@ -873,6 +915,8 @@ yf::SRUtoZ3950::Impl::z3950_scan_request(mp::Package &package, Z_SRW_PDU *sru_pdu_res, Z_SRW_scanRequest const *sr_req) const { + assert(sru_pdu_res->u.scan_response); + Package z3950_package(package.session(), package.origin()); z3950_package.copy_filter(package); //mp::odr odr_en(ODR_ENCODE); @@ -1033,30 +1077,30 @@ bool yf::SRUtoZ3950::Impl::z3950_build_query(mp::odr &odr_en, Z_Query *z_query, // return message; // } -void yf::SRUtoZ3950::Impl::http_response(metaproxy_1::Package &package, - const std::string &content, - int http_code) const -{ +// void yf::SRUtoZ3950::Impl::http_response(metaproxy_1::Package &package, +// const std::string &content, +// int http_code) const +// { - Z_GDU *zgdu_req = package.request().get(); - Z_GDU *zgdu_res = 0; - mp::odr odr; - zgdu_res - = odr.create_HTTP_Response(package.session(), - zgdu_req->u.HTTP_Request, - http_code); +// Z_GDU *zgdu_req = package.request().get(); +// Z_GDU *zgdu_res = 0; +// mp::odr odr; +// zgdu_res +// = odr.create_HTTP_Response(package.session(), +// zgdu_req->u.HTTP_Request, +// http_code); - zgdu_res->u.HTTP_Response->content_len = content.size(); - zgdu_res->u.HTTP_Response->content_buf - = (char*) odr_malloc(odr, zgdu_res->u.HTTP_Response->content_len); +// zgdu_res->u.HTTP_Response->content_len = content.size(); +// zgdu_res->u.HTTP_Response->content_buf +// = (char*) odr_malloc(odr, zgdu_res->u.HTTP_Response->content_len); - strncpy(zgdu_res->u.HTTP_Response->content_buf, - content.c_str(), zgdu_res->u.HTTP_Response->content_len); +// strncpy(zgdu_res->u.HTTP_Response->content_buf, +// content.c_str(), zgdu_res->u.HTTP_Response->content_len); - //z_HTTP_header_add(odr, &hres->headers, - // "Content-Type", content_type.c_str()); - package.response() = zgdu_res; -} +// //z_HTTP_header_add(odr, &hres->headers, +// // "Content-Type", content_type.c_str()); +// package.response() = zgdu_res; +// } Z_ElementSetNames *