X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftorus.cpp;h=6ee010f7d659ca17f09b9ef639bf8e02ffc488bc;hb=51bd69f6e778ab83e4017172625c0decc8465e1b;hp=2a0a36c8c61a42cb9caef4e02857af27430eef6a;hpb=ae887cad7a7eaceb0510d89ad1bb74f34934210b;p=metaproxy-moved-to-github.git diff --git a/src/torus.cpp b/src/torus.cpp index 2a0a36c..6ee010f 100644 --- a/src/torus.cpp +++ b/src/torus.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2011 Index Data + Copyright (C) 2005-2012 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 @@ -27,7 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA namespace mp = metaproxy_1; -xmlDoc *mp::get_searchable(std::string url_template, const std::string &db, +xmlDoc *mp::get_searchable(mp::Package &package, + std::string url_template, const std::string &db, const std::string &realm, const std::string &proxy) { @@ -62,25 +63,25 @@ xmlDoc *mp::get_searchable(std::string url_template, const std::string &db, if (http_response && http_response->code == 200 && http_response->content_buf) { - yaz_log(YLOG_LOG, "Torus: %s OK", url_template.c_str()); + package.log("zoom", YLOG_LOG, "Torus: %s OK", url_template.c_str()); doc = xmlParseMemory(http_response->content_buf, http_response->content_len); } else { - yaz_log(YLOG_WARN, "Torus: %s FAIL", url_template.c_str()); + package.log("zoom", YLOG_WARN, "Torus: %s FAIL", url_template.c_str()); if (http_response) { - yaz_log(YLOG_LOG, "HTTP code: %d", http_response->code); + package.log("zoom", YLOG_LOG, "HTTP code: %d", http_response->code); } } if (http_response && http_response->content_buf) { - yaz_log(YLOG_LOG, "HTTP content:\n%.*s", - (int) http_response->content_len, - http_response->content_buf); + package.log("zoom", YLOG_LOG, "HTTP content"); + package.log_write(http_response->content_buf, + http_response->content_len); } yaz_url_destroy(url_p); return doc;