ODR odr, BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name);
-
+ bool retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries);
void log_diagnostic(mp::Package &package,
int error, const char *addinfo);
public:
private:
void configure_local_records(const xmlNode * ptr, bool test_only);
bool check_proxy(const char *proxy);
+
+
+
FrontendPtr get_frontend(mp::Package &package);
void release_frontend(mp::Package &package);
SearchablePtr parse_torus_record(const xmlNode *ptr);
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(new Backend);
- b->m_proxy = proxy;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
if (proxy.length() == 0)
proxy = sptr->cfProxy;
+ b->m_proxy = proxy;
if (sptr->cfAuth.length())
{
}
Z_Records *yf::Zoom::Frontend::get_explain_records(
- Package &package,
+ mp::Package &package,
Odr_int start,
Odr_int number_to_present,
int *error,
}
-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,
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
{
yaz_poll_add(pfd.input_mask, yaz_poll_except);
if (cs->io_pending && CS_WANT_WRITE)
yaz_poll_add(pfd.input_mask, yaz_poll_write);
- else if (cs->io_pending & CS_WANT_READ)
+ if (cs->io_pending & CS_WANT_READ)
yaz_poll_add(pfd.input_mask, yaz_poll_read);
pfd.fd = cs_fileno(cs);
if (!wait_conn(conn, proxy_timeout))
break;
}
+ if (ret == 0)
+ outcome = true;
}
}
cs_close(conn);
return outcome;
}
+bool yf::Zoom::Frontend::retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries)
+{
+ if (b && b->m_proxy.length() && !m_p->check_proxy(b->m_proxy.c_str()))
+ {
+ log_diagnostic(package, error, *addinfo);
+ package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str());
+ m_backend.reset();
+ if (proxy_step) // there is a failover
+ {
+ proxy_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
+ return true;
+ }
+ error = YAZ_BIB1_PROXY_FAILURE;
+ *addinfo = odr_strdup(odr, b->m_proxy.c_str());
+ }
+ else if (same_retries == 0 && proxy_retries == 0)
+ {
+ log_diagnostic(package, error, *addinfo);
+ same_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: retry");
+ m_backend.reset();
+ proxy_step = 0;
+ return true;
+ }
+ return false;
+}
+
void yf::Zoom::Frontend::handle_search(mp::Package &package)
{
Z_GDU *gdu = package.request().get();
&addinfo, odr, &proxy_step);
if (error)
{
- if (b && b->m_proxy.length() && !m_p->check_proxy(b->m_proxy.c_str()))
- {
- log_diagnostic(package, error, addinfo);
- package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str());
- m_backend.reset();
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- goto next_proxy;
- }
- error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- log_diagnostic(package, error, addinfo);
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: retry");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
if (error)
{
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;
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));
if (error)
{
- if (b->m_proxy.length() && !m_p->check_proxy(b->m_proxy.c_str()))
- {
- log_diagnostic(package, error, addinfo);
- package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str());
- m_backend.reset();
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- goto next_proxy;
- }
- error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- log_diagnostic(package, error, addinfo);
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: retry");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
const char *element_set_name = 0;