-/* $Id: filter_sru_to_z3950.cpp,v 1.14 2006-09-26 13:15:33 marc Exp $
+/* $Id: filter_sru_to_z3950.cpp,v 1.16 2006-09-29 09:48:36 marc Exp $
Copyright (c) 2005-2006, Index Data.
See the LICENSE file for details
namespace mp = metaproxy_1;
+namespace mp_util = metaproxy_1::util;
namespace yf = mp::filter;
-namespace metaproxy_1
-{
-
- template<typename T>
- std::string to_string(const T& t)
- {
- std::ostringstream o;
- if(o << t)
- return o.str();
-
- return std::string();
- }
-
- std::string http_header_value(const Z_HTTP_Header* header,
- const std::string name)
- {
- while (header && header->name
- && std::string(header->name) != name)
- header = header->next;
-
- if (header && header->name && std::string(header->name) == name
- && header->value)
- return std::string(header->value);
-
- return std::string();
- }
-
-
-}
-
namespace metaproxy_1 {
namespace filter {
- class SRUtoZ3950::Rep {
- private:
- union SRW_query {char * cql; char * xcql; char * pqf;};
- typedef const int& SRW_query_type;
+ class SRUtoZ3950::Impl {
public:
void configure(const xmlNode *xmlnode);
void process(metaproxy_1::Package &package) const;
private:
+ union SRW_query {char * cql; char * xcql; char * pqf;};
+ typedef const int& SRW_query_type;
+ 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,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_scanRequest
const *sr_req) const;
- Z_ElementSetNames * build_esn_from_schema(mp::odr &odr_en, const char *schema) const;
- int z3950_to_srw_diag(mp::odr &odr_en, Z_SRW_searchRetrieveResponse *srw_res,
+ Z_ElementSetNames * build_esn_from_schema(mp::odr &odr_en,
+ const char *schema)
+ const;
+ int z3950_to_srw_diag(mp::odr &odr_en,
+ Z_SRW_searchRetrieveResponse *srw_res,
Z_DefaultDiagFormat *ddf) const;
};
}
}
-yf::SRUtoZ3950::SRUtoZ3950() : m_p(new Rep)
+yf::SRUtoZ3950::SRUtoZ3950() : m_p(new Impl)
{
}
m_p->process(package);
}
-void yf::SRUtoZ3950::Rep::configure(const xmlNode *xmlnode)
+void yf::SRUtoZ3950::Impl::configure(const xmlNode *xmlnode)
{
}
-void yf::SRUtoZ3950::Rep::process(mp::Package &package) const
+void yf::SRUtoZ3950::Impl::process(mp::Package &package) const
{
Z_GDU *zgdu_req = package.request().get();
}
-bool yf::SRUtoZ3950::Rep::build_simple_explain(mp::Package &package,
+bool yf::SRUtoZ3950::Impl::build_simple_explain(mp::Package &package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_explainRequest
// building SRU explain record
std::string explain_xml
- = mp::to_string(
+ = mp_util::to_string(
"<explain>\n"
" <serverInfo protocol='SRU'>\n"
" <host>")
+ package.origin().server_host()
- + mp::to_string("</host>\n"
+ + mp_util::to_string("</host>\n"
" <port>")
- + mp::to_string(package.origin().server_port())
- + mp::to_string("</port>\n"
+ + mp_util::to_string(package.origin().server_port())
+ + mp_util::to_string("</port>\n"
" <database>")
+ database
- + mp::to_string("</database>\n"
+ + mp_util::to_string("</database>\n"
" </serverInfo>\n"
"</explain>\n");
};
-bool yf::SRUtoZ3950::Rep::build_sru_debug_package(mp::Package &package) const
+bool yf::SRUtoZ3950::Impl::build_sru_debug_package(mp::Package &package) const
{
Z_GDU *zgdu_req = package.request().get();
if (zgdu_req && zgdu_req->which == Z_GDU_HTTP_Request)
}
-bool yf::SRUtoZ3950::Rep::build_sru_response(mp::Package &package,
+bool yf::SRUtoZ3950::Impl::build_sru_response(mp::Package &package,
mp::odr &odr_en,
Z_SOAP *soap,
const Z_SRW_PDU *sru_pdu_res,
- Z_SRW_PDU * yf::SRUtoZ3950::Rep::decode_sru_request(mp::Package &package,
+ 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,
}
bool
-yf::SRUtoZ3950::Rep::check_sru_query_exists(mp::Package &package,
+yf::SRUtoZ3950::Impl::check_sru_query_exists(mp::Package &package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest
bool
-yf::SRUtoZ3950::Rep::z3950_init_request(mp::Package &package,
+yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
const std::string &database) const
{
// prepare Z3950 package
}
bool
-yf::SRUtoZ3950::Rep::z3950_close_request(mp::Package &package) const
+yf::SRUtoZ3950::Impl::z3950_close_request(mp::Package &package) const
{
// close SRU package
package.session().close();
}
bool
-yf::SRUtoZ3950::Rep::z3950_search_request(mp::Package &package,
+yf::SRUtoZ3950::Impl::z3950_search_request(mp::Package &package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest
}
bool
-yf::SRUtoZ3950::Rep::z3950_present_request(mp::Package &package,
+yf::SRUtoZ3950::Impl::z3950_present_request(mp::Package &package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_searchRetrieveRequest
}
bool
-yf::SRUtoZ3950::Rep::z3950_scan_request(mp::Package &package,
+yf::SRUtoZ3950::Impl::z3950_scan_request(mp::Package &package,
mp::odr &odr_en,
Z_SRW_PDU *sru_pdu_res,
Z_SRW_scanRequest const *sr_req) const
return false;
}
-bool yf::SRUtoZ3950::Rep::z3950_build_query(mp::odr &odr_en, Z_Query *z_query,
+bool yf::SRUtoZ3950::Impl::z3950_build_query(mp::odr &odr_en, Z_Query *z_query,
const SRW_query &query,
SRW_query_type query_type) const
{
std::string
-yf::SRUtoZ3950::Rep::sru_protocol(const Z_HTTP_Request &http_req) const
+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 http_method(http_req.method);
const std::string http_type
- = http_header_value(http_req.headers, "Content-Type");
+ = mp_util::http_header_value(http_req.headers, "Content-Type");
if (http_method == "GET")
return "SRU GET";
}
std::string
-yf::SRUtoZ3950::Rep::debug_http(const Z_HTTP_Request &http_req) const
+yf::SRUtoZ3950::Impl::debug_http(const Z_HTTP_Request &http_req) const
{
std::string message("<html>\n<body>\n<h1>"
"Metaproxy SRUtoZ3950 filter"
message += "<b>Path: </b> " + std::string(http_req.path) + "<br/>\n";
message += "<b>Content-Type:</b>"
- + http_header_value(http_req.headers, "Content-Type")
+ + mp_util::http_header_value(http_req.headers, "Content-Type")
+ "<br/>\n";
message += "<b>Content-Length:</b>"
- + http_header_value(http_req.headers, "Content-Length")
+ + mp_util::http_header_value(http_req.headers, "Content-Length")
+ "<br/>\n";
message += "</p>\n";
return message;
}
-void yf::SRUtoZ3950::Rep::http_response(metaproxy_1::Package &package,
+void yf::SRUtoZ3950::Impl::http_response(metaproxy_1::Package &package,
const std::string &content,
int http_code) const
{
Z_ElementSetNames *
-yf::SRUtoZ3950::Rep::build_esn_from_schema(mp::odr &odr_en,
+yf::SRUtoZ3950::Impl::build_esn_from_schema(mp::odr &odr_en,
const char *schema) const
{
if (!schema)
}
int
-yf::SRUtoZ3950::Rep::z3950_to_srw_diag(mp::odr &odr_en,
+yf::SRUtoZ3950::Impl::z3950_to_srw_diag(mp::odr &odr_en,
Z_SRW_searchRetrieveResponse *sru_res,
Z_DefaultDiagFormat *ddf) const
{