/* This file is part of Metaproxy.
- Copyright (C) 2005-2013 Index Data
+ Copyright (C) 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
#include <yaz/sortspec.h>
#include <yaz/tokenizer.h>
#include <yaz/zoom.h>
+#include <yaz/otherinfo.h>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
void present(Odr_int start, Odr_int number, ZOOM_record *recs,
int *error, char **addinfo, ODR odr);
void set_option(const char *name, const char *value);
+ void set_option(const char *name, const char *value, size_t l);
void set_option(const char *name, std::string value);
const char *get_option(const char *name);
void get_zoom_error(int *error, char **addinfo, ODR odr);
ae->value.complex->semanticAction = 0;
int num_terms = ZOOM_facet_field_term_count(ff);
- fl->elements[i] = facet_field_create(odr, al, num_terms);
+ fl->elements[i] = (Z_FacetField *)
+ odr_malloc(odr, sizeof(Z_FacetField));
+ fl->elements[i]->attributes = al;
+ fl->elements[i]->num_terms = num_terms;
+ fl->elements[i]->terms = (Z_FacetTerm **)
+ odr_malloc(odr, num_terms * sizeof(Z_FacetTerm *));
int j;
for (j = 0; j < num_terms; j++)
{
int freq;
const char *a_term = ZOOM_facet_field_get_term(ff, j, &freq);
- fl->elements[i]->terms[j] =
- facet_term_create_cstr(odr, a_term, freq);
+ Z_FacetTerm *ft = (Z_FacetTerm *) odr_malloc(odr, sizeof(*ft));
+ ft->term = z_Term_create(odr, Z_Term_general, a_term,
+ strlen(a_term));
+ ft->count = odr_intdup(odr, freq);
+
+ fl->elements[i]->terms[j] = ft;
}
}
fl->num = i;
get_zoom_error(error, addinfo, odr);
}
+
+void yf::Zoom::Backend::set_option(const char *name, const char *value, size_t l)
+{
+ ZOOM_connection_option_setl(m_connection, name, value, l);
+}
+
void yf::Zoom::Backend::set_option(const char *name, const char *value)
{
ZOOM_connection_option_set(m_connection, name, value);
sptr = it->second;
else if (torus_url.length() > 0)
{
+ std::string torus_addinfo;
std::string torus_query = "udb==" + torus_db;
xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db,
torus_query,
- realm, m_p->proxy);
+ realm, m_p->proxy,
+ torus_addinfo);
if (!doc)
{
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
- *addinfo = odr_strdup(odr, "Torus server unavailable or "
- "incorrectly configured");
+ if (torus_addinfo.length())
+ *addinfo = odr_strdup(odr, torus_addinfo.c_str());
BackendPtr b;
return b;
}
out_names[no_out_args] = "subdatabase";
out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDB.c_str());
}
+ if (!param_nocproxy && b->sptr->contentConnector.length())
+ param_nocproxy = "1";
+
if (param_nocproxy)
{
out_names[no_out_args] = "nocproxy";
}
else
{
- if (sptr->sru.length() == 0)
- b->set_option("user", authentication); /* Z39.50 */
+ const char *auth = authentication.c_str();
+ const char *cp1 = strchr(auth, ' ');
+ if (!cp1 && sptr->sru.length())
+ cp1 = strchr(auth, '/');
+ if (!cp1)
+ {
+ /* Z39.50 user/password style, or no password for SRU */
+ b->set_option("user", auth);
+ }
else
{
- std::string user;
- std::string password;
- std::string authtype = sptr->authenticationMode;
-
- {
- const char *cstr = authentication.c_str();
- const char *cp1 = strchr(cstr, '/');
- if (cp1)
- {
- password.assign(cp1 + 1);
- user.assign(cstr, cp1 - cstr);
- }
- else
- user.assign(cstr);
- }
+ /* now consider group as well */
+ const char *cp2 = strchr(cp1 + 1, ' ');
- if (authtype.compare("url") == 0)
- {
- /* SRU URL encoding of auth stuff */
- ODR o = odr_createmem(ODR_ENCODE);
- char *path = 0;
- const char *names[3];
- const char *values[3];
-
- names[0] = "x-username";
- values[0] = user.c_str();
- names[1] = "x-password";
- values[1] = password.c_str();
- names[2] = 0;
- values[2] = 0;
-
- yaz_array_to_uri(&path, o, (char **) names, (char **) values);
- if (extraArgs.length())
- extraArgs.append("&");
- extraArgs.append(path);
- odr_destroy(o);
- }
+ b->set_option("user", auth, cp1 - auth);
+ if (!cp2)
+ b->set_option("password", cp1 + 1);
else
{
- b->set_option("user", user);
- if (password.length())
- b->set_option("password", password);
+ b->set_option("group", cp1 + 1, cp2 - cp1 - 1);
+ b->set_option("password", cp2 + 1);
}
}
+ if (sptr->authenticationMode.length())
+ b->set_option("authenticationMode", sptr->authenticationMode);
if (proxy.length())
b->set_option("proxy", proxy);
}
else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
{
+ std::string torus_addinfo;
std::string torus_query(query->u.type_104->u.cql);
xmlDoc *doc = mp::get_searchable(package, torus_url, "",
torus_query,
- realm, m_p->proxy);
+ realm, m_p->proxy,
+ torus_addinfo);
if (m_p->explain_xsp)
{
xmlDoc *rec_res = xsltApplyStylesheet(m_p->explain_xsp, doc, 0);
if (!doc)
{
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
- *addinfo = odr_strdup(odr, "Torus server unavailable or "
- "incorrectly configured");
+ if (torus_addinfo.length())
+ *addinfo = odr_strdup(odr, torus_addinfo.c_str());
}
else
{
if (b->get_option("sru"))
{
- int status = 0;
Z_RPNQuery *zquery;
zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
- mp::wrbuf wrb;
+ mp::wrbuf wrb_cql;
+ mp::wrbuf wrb_addinfo;
if (!strcmp(b->get_option("sru"), "solr"))
- {
- solr_transform_t cqlt = solr_transform_create();
-
- status = solr_transform_rpn2solr_wrbuf(cqlt, wrb, zquery);
-
- solr_transform_close(cqlt);
- }
+ error = solr_transform_rpn2solr_stream_r(b->cqlt, wrb_addinfo,
+ wrbuf_vp_puts, wrb_cql,
+ zquery);
else
+ error = cql_transform_rpn2cql_stream_r(b->cqlt, wrb_addinfo,
+ wrbuf_vp_puts, wrb_cql,
+ zquery);
+ if (error)
{
- status = cql_transform_rpn2cql_wrbuf(b->cqlt, wrb, zquery);
- }
- if (status == 0)
- {
- ZOOM_query_cql(q, wrbuf_cstr(wrb));
- package.log("zoom", YLOG_LOG, "CQL: %s", wrbuf_cstr(wrb));
- b->search(q, &hits, &error, &addinfo, &fl, odr);
- }
- ZOOM_query_destroy(q);
-
- if (status)
- {
- error = YAZ_BIB1_MALFORMED_QUERY;
- const char *addinfo = "can not convert from RPN to CQL/Solr";
- log_diagnostic(package, error, addinfo);
- apdu_res = odr.create_searchResponse(apdu_req, error, addinfo);
+ log_diagnostic(package, error, wrb_addinfo.c_str_null());
+ apdu_res = odr.create_searchResponse(apdu_req, error,
+ wrb_addinfo.c_str_null());
package.response() = apdu_res;
return;
}
+ ZOOM_query_cql(q, wrb_cql.c_str());
+ package.log("zoom", YLOG_LOG, "search CQL: %s", wrb_cql.c_str());
+ b->search(q, &hits, &error, &addinfo, &fl, odr);
+ ZOOM_query_destroy(q);
}
else
{
- ZOOM_query_prefix(q, wrbuf_cstr(pqf_wrbuf));
- package.log("zoom", YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
+ ZOOM_query_prefix(q, pqf_wrbuf.c_str());
+ package.log("zoom", YLOG_LOG, "search PQF: %s", pqf_wrbuf.c_str());
b->search(q, &hits, &error, &addinfo, &fl, odr);
ZOOM_query_destroy(q);
}
}
}
- std::string ip = package.origin().get_address();
- yaz_log(YLOG_LOG, "IP=%s", ip.c_str());
+ Z_OtherInformation **oi = &req->otherInfo;
+ const char *ip =
+ yaz_oi_get_string_oid(oi, yaz_oid_userinfo_client_ip, 1, 0);
+ if (!ip)
+ ip = package.origin().get_address().c_str();
+
+ yaz_log(YLOG_LOG, "IP=%s", ip);
std::string torus_query;
int failure_code;
}
else
{
- const char *ip_cstr = ip.c_str();
- const char *cp = strchr(ip_cstr, ':');
- if (cp)
- ip_cstr = cp + 1;
-
torus_query = "ip encloses/net.ipaddress \"";
- torus_query += escape_cql_term(std::string(ip_cstr));
+ torus_query += escape_cql_term(std::string(ip));
torus_query += "\"";
failure_code = YAZ_BIB1_INIT_AC_BLOCKED_NETWORK_ADDRESS;
}
std::string dummy_db;
std::string dummy_realm;
+ std::string torus_addinfo;
xmlDoc *doc = mp::get_searchable(package, m_p->torus_auth_url, dummy_db,
- torus_query, dummy_realm, m_p->proxy);
+ torus_query, dummy_realm, m_p->proxy,
+ torus_addinfo);
if (!doc)
{
// something fundamental broken in lookup.
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = odr_strdup(odr, "zoom: torus server unavailable or "
- "incorrectly configured.");
+ if (torus_addinfo.length())
+ *addinfo = odr_strdup(odr, torus_addinfo.c_str());
return;
}
const xmlNode *ptr = xmlDocGetRootElement(doc);
projects / metaproxy-moved-to-github.git / blobdiff