X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Futil.cpp;h=df9984c4961b55a921257d080eb8c758aef3c620;hb=ea0a0e72e69c954962d25f92522bf0eb20281ec5;hp=2cc2759c109d703c97a07f1a3cec1ce7d4ec4154;hpb=16921033f2609ed948cf6985b4fbce3d927a20c1;p=metaproxy-moved-to-github.git diff --git a/src/util.cpp b/src/util.cpp index 2cc2759..df9984c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,24 +1,100 @@ -/* $Id: util.cpp,v 1.18 2006-06-19 23:54:02 adam Exp $ +/* $Id: util.cpp,v 1.22 2006-10-03 07:57:40 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details */ #include "config.hpp" +#include "util.hpp" #include #include #include #include // for yaz_query_to_wrbuf() -#include "util.hpp" -//#include +#include namespace mp = metaproxy_1; // Doxygen doesn't like mp::util, so we use this instead namespace mp_util = metaproxy_1::util; + +std::string mp_util::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(); +} + +std::string mp_util::http_headers_debug(const Z_HTTP_Request &http_req) +{ + 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) +{ + + 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; +} + + int mp_util::memcmp2(const void *buf1, int len1, const void *buf2, int len2) { @@ -191,7 +267,7 @@ void mp_util::get_init_diagnostics( } } -int mp_util::get_vhost_otherinfo( +int mp_util::get_or_remove_vhost_otherinfo( Z_OtherInformation **otherInformation, bool remove_flag, std::list &vhosts) @@ -213,6 +289,20 @@ int mp_util::get_vhost_otherinfo( return cat; } +void mp_util::get_vhost_otherinfo( + Z_OtherInformation *otherInformation, + std::list &vhosts) +{ + get_or_remove_vhost_otherinfo(&otherInformation, false, vhosts); +} + +int mp_util::remove_vhost_otherinfo( + Z_OtherInformation **otherInformation, + std::list &vhosts) +{ + return get_or_remove_vhost_otherinfo(otherInformation, true, vhosts); +} + void mp_util::set_vhost_otherinfo( Z_OtherInformation **otherInformation, ODR odr, const std::list &vhosts)