X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fsru_util.cpp;h=45e5823ccfb681832a20efaf392ce320d420d1c4;hb=0dcfd01a8fc058f1537af7bf16f29ca901a3e61b;hp=2b254109f6f15e274c0356bf47e86df3360d3578;hpb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;p=metaproxy-moved-to-github.git
diff --git a/src/sru_util.cpp b/src/sru_util.cpp
index 2b25410..45e5823 100644
--- a/src/sru_util.cpp
+++ b/src/sru_util.cpp
@@ -1,7 +1,19 @@
-/* $Id: sru_util.cpp,v 1.7 2007-01-25 14:05:54 adam Exp $
- Copyright (c) 2005-2007, Index Data.
-
- See the LICENSE file for details
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2009 Index Data
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "sru_util.hpp"
@@ -23,7 +35,7 @@ const std::string xmlns_explain("http://explain.z3950.org/dtd/2.0/");
bool mp_util::build_sru_debug_package(mp::Package &package)
{
Z_GDU *zgdu_req = package.request().get();
- if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
+ if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
{
Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request;
std::string content = mp_util::http_headers_debug(*http_req);
@@ -36,40 +48,39 @@ bool mp_util::build_sru_debug_package(mp::Package &package)
}
mp_util::SRUServerInfo mp_util::get_sru_server_info(mp::Package &package)
- //Z_SRW_explainRequest const *er_req)
{
mp_util::SRUServerInfo sruinfo;
- // getting database info
- //if (er_req && er_req->database)
- // sruinfo.database = er_req->database;
-
// getting host and port info
sruinfo.host = package.origin().listen_host();
sruinfo.port = mp_util::to_string(package.origin().listen_port());
// overwriting host and port info if set from HTTP Host header
Z_GDU *zgdu_req = package.request().get();
- if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
+ if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
{
Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request;
if (http_req)
{
-
- //std::string http_method = http_req->method;
- //std::string http_version = http_req->version;
std::string http_path = http_req->path;
+
+ // taking out GET parameters
+ std::string::size_type ipath = http_path.rfind("?");
+ if (ipath != std::string::npos)
+ http_path.assign(http_path, 0, ipath);
+
+ // assign to database name
if (http_path.size() > 1)
sruinfo.database.assign(http_path, 1, std::string::npos);
-
+
std::string http_host_address
= mp_util::http_header_value(http_req->headers, "Host");
- std::string::size_type i = http_host_address.rfind(":");
- if (i != std::string::npos)
+ std::string::size_type iaddress = http_host_address.rfind(":");
+ if (iaddress != std::string::npos)
{
- sruinfo.host.assign(http_host_address, 0, i);
- sruinfo.port.assign(http_host_address, i + 1,
+ sruinfo.host.assign(http_host_address, 0, iaddress);
+ sruinfo.port.assign(http_host_address, iaddress + 1,
std::string::npos);
}
}
@@ -83,52 +94,6 @@ mp_util::SRUServerInfo mp_util::get_sru_server_info(mp::Package &package)
}
-// bool mp_util::build_simple_explain(mp::Package &package,
-// mp::odr &odr_en,
-// Z_SRW_PDU *sru_pdu_res,
-// SRUServerInfo sruinfo,
-// Z_SRW_explainRequest const *er_req)
-// {
-// // z3950'fy recordPacking
-// int record_packing = Z_SRW_recordPacking_XML;
-// if (er_req && er_req->recordPacking && 's' == *(er_req->recordPacking))
-// record_packing = Z_SRW_recordPacking_string;
-
-// // building SRU explain record
-// std::string explain_xml
-// = mp_util::to_string(
-// "\n"
-// " \n"
-// " ")
-// + sruinfo.host
-// + mp_util::to_string("\n"
-// " ")
-// + sruinfo.port
-// + mp_util::to_string("\n"
-// " ")
-// + sruinfo.database
-// + mp_util::to_string("\n"
-// " \n"
-// "\n");
-
-
-// // preparing explain record insert
-// Z_SRW_explainResponse *sru_res = sru_pdu_res->u.explain_response;
-
-// // inserting one and only explain record
-
-// sru_res->record.recordPosition = odr_intdup(odr_en, 1);
-// sru_res->record.recordPacking = record_packing;
-// sru_res->record.recordSchema = (char *)xmlns_explain.c_str();
-// sru_res->record.recordData_len = 1 + explain_xml.size();
-// sru_res->record.recordData_buf
-// = odr_strdupn(odr_en, (const char *)explain_xml.c_str(),
-// 1 + explain_xml.size());
-
-// return true;
-// };
-
-
bool mp_util::build_sru_explain(metaproxy_1::Package &package,
metaproxy_1::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
@@ -189,7 +154,7 @@ bool mp_util::build_sru_explain(metaproxy_1::Package &package,
1 + explain_xml.size());
return true;
-};
+}
bool mp_util::build_sru_response(mp::Package &package,
@@ -237,7 +202,7 @@ bool mp_util::build_sru_response(mp::Package &package,
{"http://www.loc.gov/zing/srw/update/", 0,
(Z_SOAP_fun) yaz_ucp_codec},
{0, 0, 0}
- };
+ };
// empty stylesheet means NO stylesheet
@@ -262,13 +227,13 @@ bool mp_util::build_sru_response(mp::Package &package,
- 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_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;
@@ -276,7 +241,8 @@ bool mp_util::build_sru_response(mp::Package &package,
//assert((zgdu_req->which == Z_GDU_HTTP_Request));
//ignoring all non HTTP_Request packages
- if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request)){
+ if (!zgdu_req || !(zgdu_req->which == Z_GDU_HTTP_Request))
+ {
return 0;
}
@@ -286,7 +252,7 @@ bool mp_util::build_sru_response(mp::Package &package,
// 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,
+ 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)))
@@ -299,7 +265,7 @@ bool mp_util::build_sru_response(mp::Package &package,
}
return sru_pdu_req;
}
- else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, &soap,
+ else if (0 == yaz_srw_decode(http_req, &sru_pdu_req, soap,
odr_de, &charset))
return sru_pdu_req;
else
@@ -318,7 +284,7 @@ mp_util::check_sru_query_exists(mp::Package &package,
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) )
+ 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),
@@ -330,15 +296,15 @@ mp_util::check_sru_query_exists(mp::Package &package,
10, "CQL query is empty");
return false;
}
- if( (sr_req->query_type == Z_SRW_query_type_xcql && !sr_req->query.xcql) )
+ 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");
+ 10, "XCQL query is empty");
return false;
- }
- if( (sr_req->query_type == Z_SRW_query_type_pqf && !sr_req->query.pqf) )
+ }
+ 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),
@@ -347,18 +313,15 @@ mp_util::check_sru_query_exists(mp::Package &package,
return false;
}
return true;
-};
-
-
+}
Z_ElementSetNames *
-mp_util::build_esn_from_schema(mp::odr &odr_en,
- const char *schema)
+mp_util::build_esn_from_schema(mp::odr &odr_en, const char *schema)
{
- if (!schema)
+ if (!schema)
return 0;
-
+
Z_ElementSetNames *esn
= (Z_ElementSetNames *) odr_malloc(odr_en, sizeof(Z_ElementSetNames));
esn->which = Z_ElementSetNames_generic;
@@ -486,126 +449,12 @@ std::ostream& std::operator<<(std::ostream& os, Z_SRW_PDU& srw_pdu)
return os;
}
-
-
-
-// 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
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+