X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fsru_util.cpp;h=e72c05d13d7015e1dab12e6f0ce3ca2b44e50f98;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=4b46ac95f4cdc07c77ce03489ceb29b8bc2fcc47;hpb=a87bf7d5c0ec0a99ef07f6f79c41ef33108c6ecb;p=metaproxy-moved-to-github.git
diff --git a/src/sru_util.cpp b/src/sru_util.cpp
index 4b46ac9..e72c05d 100644
--- a/src/sru_util.cpp
+++ b/src/sru_util.cpp
@@ -1,7 +1,19 @@
-/* $Id: sru_util.cpp,v 1.4 2007-01-05 12:26:50 marc Exp $
- Copyright (c) 2005-2006, Index Data.
-
- See the LICENSE file for details
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2008 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"
@@ -18,7 +30,7 @@ namespace mp = metaproxy_1;
// Doxygen doesn't like mp::gdu, so we use this instead
namespace mp_util = metaproxy_1::util;
-
+const std::string xmlns_explain("http://explain.z3950.org/dtd/2.0/");
bool mp_util::build_sru_debug_package(mp::Package &package)
{
@@ -35,21 +47,13 @@ bool mp_util::build_sru_debug_package(mp::Package &package)
return false;
}
-void mp_util::get_sru_server_info(mp::Package &package,
- Z_SRW_explainRequest
- const *er_req)
+mp_util::SRUServerInfo mp_util::get_sru_server_info(mp::Package &package)
{
-
- SRUServerInfo sruinfo;
-
- // getting database info
- std::string database("Default");
- if (er_req && er_req->database)
- database = er_req->database;
+ mp_util::SRUServerInfo sruinfo;
// getting host and port info
- std::string host = package.origin().listen_host();
- std::string port = mp_util::to_string(package.origin().listen_port());
+ 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();
@@ -58,76 +62,85 @@ void mp_util::get_sru_server_info(mp::Package &package,
Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request;
if (http_req)
{
+ 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)
{
- host.assign(http_host_address, 0, i);
- port.assign(http_host_address, i + 1, std::string::npos);
+ sruinfo.host.assign(http_host_address, 0, iaddress);
+ sruinfo.port.assign(http_host_address, iaddress + 1,
+ std::string::npos);
}
}
}
+
+ //std::cout << "sruinfo.database " << sruinfo.database << "\n";
+ //std::cout << "sruinfo.host " << sruinfo.host << "\n";
+ //std::cout << "sruinfo.port " << sruinfo.port << "\n";
+
+ return sruinfo;
}
-bool mp_util::build_simple_explain(mp::Package &package,
- mp::odr &odr_en,
- Z_SRW_PDU *sru_pdu_res,
- Z_SRW_explainRequest
- const *er_req)
+
+bool mp_util::build_sru_explain(metaproxy_1::Package &package,
+ metaproxy_1::odr &odr_en,
+ Z_SRW_PDU *sru_pdu_res,
+ SRUServerInfo sruinfo,
+ const xmlNode *explain,
+ 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;
- // getting database info
- std::string database("Default");
- if (er_req && er_req->database)
- database = er_req->database;
+ // building SRU explain record
+ std::string explain_xml;
+
+ if (explain == 0){
+ 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");
+ }
+ else {
+ // make new XML DOC with given explain node
+ xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");
+ xmlDocSetRootElement(doc, (xmlNode*)explain);
- // getting host and port info
- std::string host = package.origin().listen_host();
- std::string port = mp_util::to_string(package.origin().listen_port());
+ xmlChar *xmlbuff;
+ int xmlbuffsz;
+ xmlDocDumpFormatMemory(doc, &xmlbuff, &xmlbuffsz, 1);
- // 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)
- {
- Z_HTTP_Request* http_req = zgdu_req->u.HTTP_Request;
- if (http_req)
- {
- 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)
- {
- host.assign(http_host_address, 0, i);
- port.assign(http_host_address, i + 1, std::string::npos);
- }
- }
+ explain_xml.assign((const char*)xmlbuff, 0, xmlbuffsz);
}
- // building SRU explain record
- std::string explain_xml
- = mp_util::to_string(
- "\n"
- " \n"
- " ")
- + host
- + mp_util::to_string("\n"
- " ")
- + port
- + mp_util::to_string("\n"
- " ")
- + database
- + mp_util::to_string("\n"
- " \n"
- "\n");
-
+
+ // 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;
// preparing explain record insert
Z_SRW_explainResponse *sru_res = sru_pdu_res->u.explain_response;
@@ -136,7 +149,7 @@ bool mp_util::build_simple_explain(mp::Package &package,
sru_res->record.recordPosition = odr_intdup(odr_en, 1);
sru_res->record.recordPacking = record_packing;
- sru_res->record.recordSchema = "http://explain.z3950.org/dtd/2.0/";
+ 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(),
@@ -220,7 +233,7 @@ bool mp_util::build_sru_response(mp::Package &package,
mp::odr &odr_de,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
- Z_SOAP *&soap,
+ Z_SOAP **soap,
char *charset,
char *stylesheet)
{
@@ -240,7 +253,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)))
@@ -253,7 +266,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