(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 * mp_util::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)
+{
+ 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;
+
+ // checking if we got a SRU GET/POST/SOAP HTTP package
+ // closing connection if we did not ...
+ 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
+mp_util::check_sru_query_exists(mp::Package &package,
+ mp::odr &odr_en,
+ Z_SRW_PDU *sru_pdu_res,
+ Z_SRW_searchRetrieveRequest const *sr_req)
+{
+ 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;
+};
+
+
+
+
+Z_ElementSetNames *
+mp_util::build_esn_from_schema(mp::odr &odr_en,
+ const char *schema)
+{
+ 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;
}
@@ -167,6 +458,119 @@ std::ostream& std::operator<<(std::ostream& os, Z_SRW_PDU& srw_pdu)
+
+// mp_util::SRU::SRU_protocol_type
+// mp_util::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 SRU_NONE;
+// }
+
+// std::string
+// mp_util::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
+// mp_util::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 mp_util::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;
+// }
+
/*
* Local variables:
* c-basic-offset: 4