projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mp_util::get_init_diagnostics based on yaz_decode_init_diag
[metaproxy-moved-to-github.git]
/
src
/
torus.cpp
diff --git
a/src/torus.cpp
b/src/torus.cpp
index
2a0a36c
..
b5f0275
100644
(file)
--- a/
src/torus.cpp
+++ b/
src/torus.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* 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
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,14
+27,22
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
namespace mp = metaproxy_1;
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 &query,
const std::string &realm,
const std::string &proxy)
{
const std::string &realm,
const std::string &proxy)
{
- // http://newmk2.indexdata.com/torus2/searchable.ebsco/records/?query=udb=aberdeenUni
+ // http://mk2.indexdata.com/torus2/searchable/records/?query=udb%3d%db
+ // or
+ // http://mk2.indexdata.com/torus2/searchable/records/?query=%query
xmlDoc *doc = 0;
size_t found;
xmlDoc *doc = 0;
size_t found;
+ found = url_template.find("%query");
+ if (found != std::string::npos)
+ url_template.replace(found, 6, mp::util::uri_encode(query));
+
found = url_template.find("%db");
if (found != std::string::npos)
url_template.replace(found, 3, mp::util::uri_encode(db));
found = url_template.find("%db");
if (found != std::string::npos)
url_template.replace(found, 3, mp::util::uri_encode(db));
@@
-45,7
+53,7
@@
xmlDoc *mp::get_searchable(std::string url_template, const std::string &db,
Z_HTTP_Header *http_headers = 0;
mp::odr odr;
Z_HTTP_Header *http_headers = 0;
mp::odr odr;
-
+
z_HTTP_header_add(odr, &http_headers, "Accept","application/xml");
yaz_url_t url_p = yaz_url_create();
z_HTTP_header_add(odr, &http_headers, "Accept","application/xml");
yaz_url_t url_p = yaz_url_create();
@@
-59,28
+67,28
@@
xmlDoc *mp::get_searchable(std::string url_template, const std::string &db,
0, /* content buf */
0 /* content_len */
);
0, /* content buf */
0 /* content_len */
);
- if (http_response && http_response->code == 200 &&
+ if (http_response && http_response->code == 200 &&
http_response->content_buf)
{
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);
doc = xmlParseMemory(http_response->content_buf,
http_response->content_len);
-
+
}
else
{
}
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)
{
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)
{
}
}
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;
}
yaz_url_destroy(url_p);
return doc;