(sru_pdu_res)) << "\n";
- else
- std::cout << "SRU empty\n";
-
-
- Z_GDU *zgdu_req = package.request().get();
- if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
- {
- Z_GDU *zgdu_res //= z_get_HTTP_Response(odr_en, 200);
- = odr_en.create_HTTP_Response(package.session(),
- zgdu_req->u.HTTP_Request,
- 200);
-
- // adding HTTP response code and headers
- Z_HTTP_Response * http_res = zgdu_res->u.HTTP_Response;
- //http_res->code = http_code;
-
- std::string ctype("text/xml");
- if (charset){
- ctype += "; charset=";
- ctype += charset;
- }
-
- z_HTTP_header_add(odr_en,
- &http_res->headers, "Content-Type", ctype.c_str());
-
- // packaging Z_SOAP into HTML response
- static Z_SOAP_Handler soap_handlers[4] = {
- {"http://www.loc.gov/zing/srw/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
- {"http://www.loc.gov/zing/srw/v1.0/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
- {"http://www.loc.gov/zing/srw/update/", 0,
- (Z_SOAP_fun) yaz_ucp_codec},
- {0, 0, 0}
- };
-
-
- // empty stylesheet means NO stylesheet
- if (stylesheet && *stylesheet == '\0')
- stylesheet = 0;
-
- // encoding SRU package
-
- soap->u.generic->p = (void*) sru_pdu_res;
- //int ret =
- z_soap_codec_enc_xsl(odr_en, &soap,
- &http_res->content_buf, &http_res->content_len,
- soap_handlers, charset, stylesheet);
-
-
- package.response() = zgdu_res;
- return true;
- }
- package.session().close();
- return false;
-}
-
-
-
- Z_SRW_PDU * yf::SRUtoZ3950::Impl::decode_sru_request(mp::Package &package,
- mp::odr &odr_de,
- mp::odr &odr_en,
- Z_SRW_PDU *sru_pdu_res,
- Z_SOAP *&soap,
- char *charset,
- char *stylesheet)
- const
-{
- Z_GDU *zgdu_req = package.request().get();
- Z_SRW_PDU *sru_pdu_req = 0;
-
- assert((zgdu_req->which == Z_GDU_HTTP_Request));
-
- //ignoring all non HTTP_Request packages
- //if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request)){
- // return 0;
- //}
-
- Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request;
- if (! http_req)
- return 0;
-
- //Z_SRW_PDU *sru_pdu_res_exp = yaz_srw_get(odr_en, Z_SRW_explain_response);
-
- if (0 == yaz_sru_decode(http_req, &sru_pdu_req, &soap,
- odr_de, &charset,
- &(sru_pdu_res->u.response->diagnostics),
- &(sru_pdu_res->u.response->num_diagnostics)))
- {
- if (sru_pdu_res->u.response->num_diagnostics)
- {
- //sru_pdu_res = sru_pdu_res_exp;
- package.session().close();
- return 0;
- }
- return sru_pdu_req;
- }
- else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap,
- odr_de, &charset))
- return sru_pdu_req;
- else
- {
- //sru_pdu_res = sru_pdu_res_exp;
- package.session().close();
- return 0;
- }
- return 0;
-}
-
-bool
-yf::SRUtoZ3950::Impl::check_sru_query_exists(mp::Package &package,
- mp::odr &odr_en,
- Z_SRW_PDU *sru_pdu_res,
- Z_SRW_searchRetrieveRequest
- const *sr_req)
- const
-{
- if( (sr_req->query_type == Z_SRW_query_type_cql && !sr_req->query.cql) )
- {
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.response->diagnostics),
- &(sru_pdu_res->u.response->num_diagnostics),
- 7, "query");
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.response->diagnostics),
- &(sru_pdu_res->u.response->num_diagnostics),
- 10, "CQL query is empty");
- return false;
- }
- if( (sr_req->query_type == Z_SRW_query_type_xcql && !sr_req->query.xcql) )
- {
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.response->diagnostics),
- &(sru_pdu_res->u.response->num_diagnostics),
- 10, "XCQL query is empty");
- return false;
- }
- if( (sr_req->query_type == Z_SRW_query_type_pqf && !sr_req->query.pqf) )
- {
- yaz_add_srw_diagnostic(odr_en,
- &(sru_pdu_res->u.response->diagnostics),
- &(sru_pdu_res->u.response->num_diagnostics),
- 10, "PQF query is empty");
- return false;
- }
- return true;
-};
-
-
bool
yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
@@ -584,6 +315,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);
@@ -668,6 +402,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;
@@ -677,8 +412,6 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
if (!(sr_req->maximumRecords) || 0 == *(sr_req->maximumRecords))
return true;
-
-
bool send_z3950_present = true;
// recordXPath unsupported.
@@ -688,7 +421,7 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
yaz_add_srw_diagnostic(odr_en,
&(sru_pdu_res->u.response->diagnostics),
&(sru_pdu_res->u.response->num_diagnostics),
- 72, "RecordXPath not supported");
+ 72, 0);
}
// resultSetTTL unsupported.
@@ -712,13 +445,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),
@@ -726,6 +462,18 @@ 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;
@@ -771,8 +519,8 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
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);
+ = mp_util::build_esn_from_schema(odr_en,
+ (const char *) sr_req->recordSchema);
}
// z3950'fy time to live - flagged as diagnostics above
@@ -829,15 +577,16 @@ yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
sru_res->num_records
* sizeof(Z_SRW_record));
+
// srw'fy nextRecordPosition
- // protecting for inserting one behind the last z3950 record
+ // next position never zero or behind the last z3950 record
if (pr->nextResultSetPosition
- //&& *(pr->nextResultSetPosition) <= *(sr_req->maximumRecords)
+ && *(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++)
{
@@ -890,6 +639,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);
@@ -989,106 +740,6 @@ bool yf::SRUtoZ3950::Impl::z3950_build_query(mp::odr &odr_en, Z_Query *z_query,
}
-// std::string
-// yf::SRUtoZ3950::Impl::sru_protocol(const Z_HTTP_Request &http_req) const
-// {
-// const std::string mime_urlencoded("application/x-www-form-urlencoded");
-// const std::string mime_text_xml("text/xml");
-// const std::string mime_soap_xml("application/soap+xml");
-
-// const std::string http_method(http_req.method);
-// const std::string http_type
-// = mp_util::http_header_value(http_req.headers, "Content-Type");
-
-// if (http_method == "GET")
-// return "SRU GET";
-
-// if (http_method == "POST"
-// && http_type == mime_urlencoded)
-// return "SRU POST";
-
-// if ( http_method == "POST"
-// && (http_type == mime_text_xml
-// || http_type == mime_soap_xml))
-// return "SRU SOAP";
-
-// return "HTTP";
-// }
-
-// std::string
-// yf::SRUtoZ3950::Impl::debug_http(const Z_HTTP_Request &http_req) const
-// {
-// std::string message("\n\n"
-// "Metaproxy SRUtoZ3950 filter"
-// "
\n");
-
-// message += "HTTP Info
\n";
-// message += "\n";
-// message += "Method: " + std::string(http_req.method) + "
\n";
-// message += "Version: " + std::string(http_req.version) + "
\n";
-// message += "Path: " + std::string(http_req.path) + "
\n";
-
-// message += "Content-Type:"
-// + mp_util::http_header_value(http_req.headers, "Content-Type")
-// + "
\n";
-// message += "Content-Length:"
-// + mp_util::http_header_value(http_req.headers, "Content-Length")
-// + "
\n";
-// message += "
\n";
-
-// message += "Headers
\n";
-// message += "\n";
-// Z_HTTP_Header* header = http_req.headers;
-// while (header){
-// message += "Header: "
-// + std::string(header->name) + ": "
-// + std::string(header->value) + "
\n";
-// header = header->next;
-// }
-// message += "
\n";
-// message += "\n\n";
-// return message;
-// }
-
-// 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);
-
-// 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);
-
-// //z_HTTP_header_add(odr, &hres->headers,
-// // "Content-Type", content_type.c_str());
-// package.response() = zgdu_res;
-// }
-
-
-Z_ElementSetNames *
-yf::SRUtoZ3950::Impl::build_esn_from_schema(mp::odr &odr_en,
- const char *schema) const
-{
- if (!schema)
- return 0;
-
- Z_ElementSetNames *esn
- = (Z_ElementSetNames *) odr_malloc(odr_en, sizeof(Z_ElementSetNames));
- esn->which = Z_ElementSetNames_generic;
- esn->u.generic = odr_strdup(odr_en, schema);
- return esn;
-}
int
yf::SRUtoZ3950::Impl::z3950_to_srw_diag(mp::odr &odr_en,
@@ -1117,7 +768,7 @@ static mp::filter::Base* filter_creator()
extern "C" {
struct metaproxy_1_filter_struct metaproxy_1_filter_sru_to_z3950 = {
0,
- "SRUtoZ3950",
+ "sru_z3950",
filter_creator
};
}