/* This file is part of Metaproxy.
- Copyright (C) 2005-2012 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
class Zoom::Searchable : boost::noncopyable {
public:
std::string authentication;
+ std::string authenticationMode;
std::string cfAuth;
std::string cfProxy;
std::string cfSubDB;
void connect(std::string zurl, int *error, char **addinfo,
ODR odr);
void search(ZOOM_query q, Odr_int *hits,
- int *error, char **addinfo, ODR odr);
+ int *error, char **addinfo, Z_FacetList **fl, ODR odr);
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);
BackendPtr m_backend;
void handle_package(mp::Package &package);
void handle_search(mp::Package &package);
-
void auth(mp::Package &package, Z_InitRequest *req,
int *error, char **addinfo, ODR odr);
}
void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
- int *error, char **addinfo, ODR odr)
+ int *error, char **addinfo, Z_FacetList **flp,
+ ODR odr)
{
ZOOM_resultset_destroy(m_resultset);
+ m_resultset = 0;
+ if (*flp)
+ {
+ WRBUF w = wrbuf_alloc();
+ yaz_facet_list_to_wrbuf(w, *flp);
+ set_option("facets", wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ }
m_resultset = ZOOM_connection_search(m_connection, q);
get_zoom_error(error, addinfo, odr);
if (*error == 0)
*hits = ZOOM_resultset_size(m_resultset);
else
*hits = 0;
+ *flp = 0;
+ size_t num_facets = ZOOM_resultset_facets_size(m_resultset);
+ if (num_facets > 0)
+ {
+ size_t i;
+ Z_FacetList *fl = (Z_FacetList *) odr_malloc(odr, sizeof(*fl));
+ fl->elements = (Z_FacetField **)
+ odr_malloc(odr, num_facets * sizeof(*fl->elements));
+ for (i = 0; i < num_facets; i++)
+ {
+ ZOOM_facet_field ff =
+ ZOOM_resultset_get_facet_field_by_index(m_resultset, i);
+ if (!ff)
+ break;
+ Z_AttributeList *al = (Z_AttributeList *)
+ odr_malloc(odr, sizeof(*al));
+ al->num_attributes = 1;
+ al->attributes = (Z_AttributeElement **)
+ odr_malloc(odr, sizeof(*al->attributes));
+ Z_AttributeElement *ae = al->attributes[0] = (Z_AttributeElement *)
+ odr_malloc(odr, sizeof(**al->attributes));
+ ae->attributeSet = 0;
+ ae->attributeType = odr_intdup(odr, 1);
+ ae->which = Z_AttributeValue_complex;
+ ae->value.complex = (Z_ComplexAttribute *)
+ odr_malloc(odr, sizeof(*ae->value.complex));
+ ae->value.complex->num_list = 1;
+ ae->value.complex->list = (Z_StringOrNumeric **)
+ odr_malloc(odr, sizeof(**ae->value.complex->list));
+ ae->value.complex->list[0] = (Z_StringOrNumeric *)
+ odr_malloc(odr, sizeof(**ae->value.complex->list));
+ ae->value.complex->list[0]->which = Z_StringOrNumeric_string;
+ ae->value.complex->list[0]->u.string =
+ odr_strdup(odr, ZOOM_facet_field_name(ff));
+ ae->value.complex->num_semanticAction = 0;
+ ae->value.complex->semanticAction = 0;
+
+ int num_terms = ZOOM_facet_field_term_count(ff);
+ 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);
+ 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;
+ *flp = fl;
+ }
}
void yf::Zoom::Backend::present(Odr_int start, Odr_int number,
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);
s->authentication = mp::xml::get_text(ptr);
}
else if (!strcmp((const char *) ptr->name,
+ "authenticationMode"))
+ {
+ s->authenticationMode = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
"cfAuth"))
{
s->cfAuth = mp::xml::get_text(ptr);
if (sptr->query_encoding.length())
b->set_option("rpnCharset", sptr->query_encoding);
- if (sptr->extraArgs.length())
- b->set_option("extraArgs", sptr->extraArgs);
+ std::string extraArgs = sptr->extraArgs;
b->set_option("timeout", m_p->zoom_timeout.c_str());
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
{
- size_t found = authentication.find('/');
-
- if (sptr->sru.length() && found != std::string::npos)
+ const char *auth = authentication.c_str();
+ const char *cp1 = strchr(auth, ' ');
+ if (!cp1 && sptr->sru.length())
+ cp1 = strchr(auth, '/');
+ if (!cp1)
{
- b->set_option("user", authentication.substr(0, found));
- b->set_option("password", authentication.substr(found+1));
+ /* Z39.50 user/password style, or no password for SRU */
+ b->set_option("user", auth);
}
else
- b->set_option("user", authentication);
+ {
+ /* now consider group as well */
+ const char *cp2 = strchr(cp1 + 1, ' ');
+ b->set_option("user", auth, cp1 - auth);
+ if (!cp2)
+ b->set_option("password", cp1 + 1);
+ else
+ {
+ 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);
}
- std::string url;
+ if (extraArgs.length())
+ b->set_option("extraArgs", extraArgs);
+
+ std::string url(sptr->target);
if (sptr->sru.length())
{
- url = "http://" + sptr->target;
b->set_option("sru", sptr->sru);
-
+ if (url.find("://") == std::string::npos)
+ url = "http://" + url;
if (sptr->sru_version.length())
b->set_option("sru_version", sptr->sru_version);
}
- else
- {
- url = sptr->target;
- }
if (no_out_args)
{
char *x_args = 0;
ZOOM_query q = ZOOM_query_create();
ZOOM_query_sortby2(q, b->sptr->sortStrategy.c_str(), sortkeys.c_str());
+ Z_FacetList *fl = 0;
+
+ // Facets for request.. And later for reponse
+ if (!fl)
+ fl = yaz_oi_get_facetlist(&sr->otherInfo);
+ if (!fl)
+ fl = yaz_oi_get_facetlist(&sr->additionalSearchInfo);
+
if (b->get_option("sru"))
{
int 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, odr);
+ 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";
+ 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);
package.response() = apdu_res;
{
ZOOM_query_prefix(q, wrbuf_cstr(pqf_wrbuf));
package.log("zoom", YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf));
- b->search(q, &hits, &error, &addinfo, odr);
+ b->search(q, &hits, &error, &addinfo, &fl, odr);
ZOOM_query_destroy(q);
}
odr_intdup(odr, number_of_records_returned);
}
apdu_res->u.searchResponse->resultCount = odr_intdup(odr, hits);
+ if (fl)
+ yaz_oi_set_facetlist(&apdu_res->u.searchResponse->additionalSearchInfo,
+ odr, fl);
package.response() = apdu_res;
}
projects / metaproxy-moved-to-github.git / blobdiff