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
Add ThreadPoolSocketObserver::get_thread_info
[metaproxy-moved-to-github.git]
/
src
/
filter_zoom.cpp
diff --git
a/src/filter_zoom.cpp
b/src/filter_zoom.cpp
index
617144c
..
eb8d9b7
100644
(file)
--- a/
src/filter_zoom.cpp
+++ b/
src/filter_zoom.cpp
@@
-1149,8
+1149,9
@@
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
realm, m_p->proxy);
if (!doc)
{
realm, m_p->proxy);
if (!doc)
{
- *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
- *addinfo = odr_strdup(odr, torus_db.c_str());
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = odr_strdup(odr, "Torus server unavailable or "
+ "incorrectly configured");
BackendPtr b;
return b;
}
BackendPtr b;
return b;
}
@@
-1260,7
+1261,6
@@
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
BackendPtr b(new Backend);
BackendPtr b(new Backend);
- b->m_proxy = proxy;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
@@
-1284,6
+1284,7
@@
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
if (proxy.length() == 0)
proxy = sptr->cfProxy;
if (proxy.length() == 0)
proxy = sptr->cfProxy;
+ b->m_proxy = proxy;
if (sptr->cfAuth.length())
{
if (sptr->cfAuth.length())
{
@@
-1443,7
+1444,7
@@
void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
}
Z_Records *yf::Zoom::Frontend::get_explain_records(
}
Z_Records *yf::Zoom::Frontend::get_explain_records(
- Package &package,
+ mp::Package &package,
Odr_int start,
Odr_int number_to_present,
int *error,
Odr_int start,
Odr_int number_to_present,
int *error,
@@
-1502,7
+1503,7
@@
Z_Records *yf::Zoom::Frontend::get_explain_records(
}
}
-Z_Records *yf::Zoom::Frontend::get_records(Package &package,
+Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
Odr_int start,
Odr_int number_to_present,
int *error,
Odr_int start,
Odr_int number_to_present,
int *error,
@@
-1843,8
+1844,8
@@
yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package,
if (!doc)
{
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
if (!doc)
{
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
- *addinfo = odr_strdup(odr, "IR-Explain---1 problem. "
- "Could not obtain Torus records for Explain");
+ *addinfo = odr_strdup(odr, "Torus server unavailable or "
+ "incorrectly configured");
}
else
{
}
else
{
@@
-2067,8
+2068,7
@@
next_proxy:
cql_parser_destroy(cp);
return;
}
cql_parser_destroy(cp);
return;
}
- char ccl_buf[1024];
- r = cql_to_ccl_buf(cn, ccl_buf, sizeof(ccl_buf));
+ r = cql_to_ccl(cn, wrbuf_vp_puts, ccl_wrbuf);
if (r)
{
error = YAZ_BIB1_MALFORMED_QUERY;
if (r)
{
error = YAZ_BIB1_MALFORMED_QUERY;
@@
-2096,8
+2096,6
@@
next_proxy:
mp::wrbuf sort_spec_wrbuf;
yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf),
sort_spec_wrbuf);
mp::wrbuf sort_spec_wrbuf;
yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf),
sort_spec_wrbuf);
- wrbuf_puts(ccl_wrbuf, ccl_buf);
-
yaz_tok_cfg_t tc = yaz_tok_cfg_create();
yaz_tok_parse_t tp =
yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));
yaz_tok_cfg_t tc = yaz_tok_cfg_create();
yaz_tok_parse_t tp =
yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));