X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=78aa9c8bb486e7bd3ea39af2bd73b51bcca12730;hb=refs%2Fheads%2Fmp-593;hp=839a924c08e21b945d0d60c88a2e3d5754662912;hpb=a9a8c8f599d32df565d91542d0938400c681c41f;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index 839a924..78aa9c8 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -1,5 +1,5 @@ /* 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 @@ -51,6 +51,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include +#include namespace mp = metaproxy_1; namespace yf = mp::filter; @@ -60,6 +62,8 @@ namespace metaproxy_1 { class Zoom::Searchable : boost::noncopyable { public: std::string authentication; + std::string authenticationMode; + std::string contentAuthentication; std::string cfAuth; std::string cfProxy; std::string cfSubDB; @@ -78,6 +82,7 @@ namespace metaproxy_1 { std::string sortStrategy; std::string extraArgs; std::string rpn2cql_fname; + std::string retry_on_failure; bool use_turbomarc; bool piggyback; CCL_bibset ccl_bibset; @@ -88,29 +93,28 @@ namespace metaproxy_1 { class Zoom::Backend : boost::noncopyable { friend class Impl; friend class Frontend; - std::string zurl; mp::wrbuf m_apdu_wrbuf; ZOOM_connection m_connection; ZOOM_resultset m_resultset; - std::string m_frontend_database; SearchablePtr sptr; xsltStylesheetPtr xsp; std::string cproxy_host; bool enable_cproxy; - bool enable_explain; xmlDoc *explain_doc; std::string m_proxy; cql_transform_t cqlt; + std::string retry_on_failure; public: Backend(); ~Backend(); 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); @@ -120,31 +124,49 @@ namespace metaproxy_1 { Impl *m_p; bool m_is_virtual; bool m_in_use; + bool enable_explain; std::string session_realm; + std::string m_frontend_database; yazpp_1::GDU m_init_gdu; - BackendPtr m_backend; + // BackendPtr m_backend; + std::list m_backend_list; 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); - BackendPtr explain_search(mp::Package &package, - std::string &database, - int *error, - char **addinfo, - mp::odr &odr, - std::string torus_url, - std::string &torus_db, - std::string &realm); + void explain_search(mp::Package &package, + std::string &database, + int *error, + char **addinfo, + mp::odr &odr, + std::string torus_url, + std::string &torus_db, + std::string &realm); void handle_present(mp::Package &package); - BackendPtr get_backend_from_databases(mp::Package &package, - std::string &database, - int *error, - char **addinfo, - mp::odr &odr, - int *proxy_step); - + void get_backend_from_databases(mp::Package &package, + std::string &database, + int *error, + char **addinfo, + mp::odr &odr, + int *proxy_step); + void connect_searchable(mp::Package &package, + SearchablePtr sptr, + std::string &database, + int *error, char **addinfo, + mp::odr &odr, + int no_out_args, + const char **out_names, + const char **out_values, + std::string content_proxy, + std::string proxy, + const char *param_content_password, + const char *param_content_user, + const char *param_nocproxy, + const char *param_password, + const char *param_retry, + const char *param_user, + std::string realm); bool create_content_session(mp::Package &package, BackendPtr b, int *error, @@ -216,7 +238,9 @@ namespace metaproxy_1 { std::string torus_searchable_url; std::string torus_content_url; std::string torus_auth_url; + std::string torus_allow_ip; std::string default_realm; + std::string torus_auth_hostname; std::map fieldmap; std::string xsldir; std::string file_path; @@ -292,7 +316,6 @@ yf::Zoom::Backend::Backend() m_resultset = 0; xsp = 0; enable_cproxy = true; - enable_explain = false; explain_doc = 0; cqlt = 0; } @@ -370,15 +393,84 @@ void yf::Zoom::Backend::connect(std::string zurl, } 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, @@ -389,6 +481,12 @@ 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); @@ -411,6 +509,7 @@ yf::Zoom::Searchable::Searchable(CCL_bibset base) piggyback = true; use_turbomarc = true; sortStrategy = "embed"; + retry_on_failure = "1"; // existing default (should have been false) ccl_bibset = ccl_qual_dup(base); } @@ -420,7 +519,7 @@ yf::Zoom::Searchable::~Searchable() } yf::Zoom::Frontend::Frontend(Impl *impl) : - m_p(impl), m_is_virtual(false), m_in_use(true) + m_p(impl), m_is_virtual(false), m_in_use(true), enable_explain(false) { } @@ -508,6 +607,16 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) 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, + "contentAuthentication")) + { + s->contentAuthentication = mp::xml::get_text(ptr); + } + else if (!strcmp((const char *) ptr->name, "cfAuth")) { s->cfAuth = mp::xml::get_text(ptr); @@ -617,6 +726,11 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) } else if (!strcmp((const char *) ptr->name, "rpn2cql")) s->rpn2cql_fname = mp::xml::get_text(ptr); + else if (!strcmp((const char *) ptr->name, + "retryOnFailure")) + { + s->retry_on_failure = mp::xml::get_text(ptr); + } } return s; } @@ -694,8 +808,12 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, torus_content_url = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "auth_url")) torus_auth_url = mp::xml::get_text(attr->children); + else if (!strcmp((const char *) attr->name, "allow_ip")) + torus_allow_ip = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "realm")) default_realm = mp::xml::get_text(attr->children); + else if (!strcmp((const char *) attr->name, "auth_hostname")) + torus_auth_hostname = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "xsldir")) xsldir = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "element_transform")) @@ -1010,20 +1128,289 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package, return true; } -yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( +void yf::Zoom::Frontend::connect_searchable(mp::Package &package, + SearchablePtr sptr, + std::string &database, + int *error, char **addinfo, + mp::odr &odr, + int no_out_args, + const char **out_names, + const char **out_values, + std::string content_proxy, + std::string proxy, + const char *param_content_password, + const char *param_content_user, + const char *param_nocproxy, + const char *param_password, + const char *param_retry, + const char *param_user, + std::string realm) +{ + xsltStylesheetPtr xsp = 0; + if (sptr->transform_xsl_content.length()) + { + xmlDoc *xsp_doc = xmlParseMemory(sptr->transform_xsl_content.c_str(), + sptr->transform_xsl_content.length()); + if (!xsp_doc) + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed " + "for literalTransform XSL"); + return; + } + xsp = xsltParseStylesheetDoc(xsp_doc); + if (!xsp) + { + *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; + *addinfo = + odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed " + "for literalTransform XSL"); + xmlFreeDoc(xsp_doc); + return; + } + } + else if (sptr->transform_xsl_fname.length()) + { + const char *path = 0; + + if (m_p->xsldir.length()) + path = m_p->xsldir.c_str(); + else + path = m_p->file_path.c_str(); + std::string fname; + + char fullpath[1024]; + char *cp = yaz_filepath_resolve(sptr->transform_xsl_fname.c_str(), + path, 0, fullpath); + if (cp) + fname.assign(cp); + else + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = (char *) + odr_malloc(odr, 40 + sptr->transform_xsl_fname.length()); + sprintf(*addinfo, "zoom: could not open file %s", + sptr->transform_xsl_fname.c_str()); + return; + } + xmlDoc *xsp_doc = xmlParseFile(fname.c_str()); + if (!xsp_doc) + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = (char *) odr_malloc(odr, 50 + fname.length()); + sprintf(*addinfo, "zoom: xmlParseFile failed for file %s", + fname.c_str()); + return; + } + xsp = xsltParseStylesheetDoc(xsp_doc); + if (!xsp) + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = (char *) odr_malloc(odr, 50 + fname.length()); + sprintf(*addinfo, "zoom: xsltParseStylesheetDoc failed " + "for file %s", fname.c_str()); + xmlFreeDoc(xsp_doc); + return; + } + } + + cql_transform_t cqlt = 0; + if (sptr->rpn2cql_fname.length()) + { + char fullpath[1024]; + char *cp = yaz_filepath_resolve(sptr->rpn2cql_fname.c_str(), + m_p->file_path.c_str(), 0, fullpath); + if (cp) + cqlt = cql_transform_open_fname(fullpath); + } + else + cqlt = cql_transform_create(); + + if (!cqlt) + { + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file"); + xsltFreeStylesheet(xsp); + return; + } + + BackendPtr b(new Backend); + + b->cqlt = cqlt; + b->sptr = sptr; + b->xsp = xsp; + b->enable_cproxy = param_nocproxy ? false : true; + + if (param_retry) + b->retry_on_failure = param_retry; + else + b->retry_on_failure = b->sptr->retry_on_failure; + + if (sptr->query_encoding.length()) + b->set_option("rpnCharset", sptr->query_encoding); + + std::string extraArgs = sptr->extraArgs; + + b->set_option("timeout", m_p->zoom_timeout.c_str()); + + if (m_p->apdu_log) + b->set_option("apdulog", "1"); + + if (sptr->piggyback && sptr->sru.length()) + b->set_option("count", "1"); /* some SRU servers INSIST on getting + maximumRecords > 0 */ + b->set_option("piggyback", sptr->piggyback ? "1" : "0"); + + std::string authentication = sptr->authentication; + if (param_user) + { + authentication = std::string(param_user); + if (param_password) + authentication += "/" + std::string(param_password); + } + std::string content_authentication = sptr->contentAuthentication; + if (param_content_user) + { + content_authentication = std::string(param_content_user); + if (param_content_password) + content_authentication += "/" + std::string(param_content_password); + } + + if (proxy.length() == 0) + proxy = sptr->cfProxy; + b->m_proxy = proxy; + + if (sptr->cfAuth.length()) + { + // A CF target + b->set_option("user", sptr->cfAuth); + if (param_user) + { + out_names[no_out_args] = "user"; + out_values[no_out_args++] = odr_strdup(odr, param_user); + if (param_password) + { + out_names[no_out_args] = "password"; + out_values[no_out_args++] = odr_strdup(odr, param_password); + } + } + else if (authentication.length()) + { + size_t found = authentication.find('/'); + if (found != std::string::npos) + { + out_names[no_out_args] = "user"; + out_values[no_out_args++] = + odr_strdup(odr, authentication.substr(0, found).c_str()); + + out_names[no_out_args] = "password"; + out_values[no_out_args++] = + odr_strdup(odr, authentication.substr(found+1).c_str()); + } + else + { + out_names[no_out_args] = "user"; + out_values[no_out_args++] = + odr_strdup(odr, authentication.c_str()); + } + } + if (proxy.length()) + { + out_names[no_out_args] = "proxy"; + out_values[no_out_args++] = odr_strdup(odr, proxy.c_str()); + } + if (sptr->cfSubDB.length()) + { + 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"; + out_values[no_out_args++] = odr_strdup(odr, param_nocproxy); + } + } + else + { + 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 + { + /* 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); + } + if (extraArgs.length()) + b->set_option("extraArgs", extraArgs); + + std::string url(sptr->target); + if (sptr->sru.length()) + { + 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); + } + if (no_out_args) + { + char *x_args = 0; + out_names[no_out_args] = 0; // terminate list + + yaz_array_to_uri(&x_args, odr, (char **) out_names, + (char **) out_values); + url += "," + std::string(x_args); + } + package.log("zoom", YLOG_LOG, "url: %s", url.c_str()); + b->connect(url, error, addinfo, odr); + if (*error == 0 && b->enable_cproxy) + create_content_session(package, b, error, addinfo, odr, + content_authentication.length() ? + content_authentication : authentication, + content_proxy.length() ? content_proxy : proxy, + realm); + if (*error == 0) + { + m_backend_list.push_back(b); + } +} + +void yf::Zoom::Frontend::get_backend_from_databases( mp::Package &package, std::string &database, int *error, char **addinfo, mp::odr &odr, int *proxy_step) { - bool connection_reuse = false; std::string proxy; + bool connection_reuse = false; - std::list::const_iterator map_it; - if (m_backend && !m_backend->enable_explain && - m_backend->m_frontend_database == database) + if (m_backend_list.size() > 0 && !enable_explain && + m_frontend_database == database) { + // TODO !! proxy = m_backend->m_proxy; connection_reuse = true; - proxy = m_backend->m_proxy; } std::string input_args; @@ -1037,8 +1424,6 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( else torus_db = database; - std::string authentication; - std::string content_authentication; std::string content_proxy; std::string realm = session_realm; if (realm.length() == 0) @@ -1049,6 +1434,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( const char *param_content_user = 0; const char *param_content_password = 0; const char *param_nocproxy = 0; + const char *param_retry = 0; int no_parms = 0; char **names; @@ -1084,6 +1470,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( content_proxy = value; else if (!strcmp(name, "nocproxy")) param_nocproxy = value; + else if (!strcmp(name, "retry")) + param_retry = value; else if (!strcmp(name, "proxy")) { char **dstr; @@ -1138,7 +1526,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; sprintf(msg, "zoom: bad database argument: %s", name); *addinfo = msg; - return notfound; + return; } } if (proxy.length()) @@ -1146,46 +1534,69 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (connection_reuse) { - m_backend->connect("", error, addinfo, odr); - return m_backend; + std::list::iterator it = m_backend_list.begin(); + for (; it != m_backend_list.end(); it++) + (*it)->connect("", error, addinfo, odr); + return; } - if (param_user) - { - authentication = std::string(param_user); - if (param_password) - authentication += "/" + std::string(param_password); - } - if (param_content_user) - { - content_authentication = std::string(param_content_user); - if (param_content_password) - content_authentication += "/" + std::string(param_content_password); - } + m_frontend_database = database; + m_backend_list.clear(); if (torus_db.compare("IR-Explain---1") == 0) return explain_search(package, database, error, addinfo, odr, torus_url, torus_db, realm); + enable_explain = false; SearchablePtr sptr; std::map::iterator it; it = m_p->s_map.find(torus_db); if (it != m_p->s_map.end()) + { sptr = it->second; + connect_searchable(package, sptr, database, error, addinfo, odr, + no_out_args, out_names, out_values, + content_proxy, proxy, + param_content_password, + param_content_user, + param_nocproxy, + param_password, + param_retry, + param_user, + realm); + } + else if (torus_db == "all_local") + { + for (it = m_p->s_map.begin(); it != m_p->s_map.end(); it++) + { + sptr = it->second; + connect_searchable(package, sptr, database, error, addinfo, odr, + no_out_args, out_names, out_values, + content_proxy, proxy, + param_content_password, + param_content_user, + param_nocproxy, + param_password, + param_retry, + param_user, + realm); + } + } 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"); - BackendPtr b; - return b; + if (torus_addinfo.length()) + *addinfo = odr_strdup(odr, torus_addinfo.c_str()); + return; } const xmlNode *ptr = xmlDocGetRootElement(doc); if (ptr && ptr->type == XML_ELEMENT_NODE) @@ -1193,6 +1604,17 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (!strcmp((const char *) ptr->name, "record")) { sptr = m_p->parse_torus_record(ptr); + connect_searchable(package, sptr, database, + error, addinfo, odr, + no_out_args, out_names, out_values, + content_proxy, proxy, + param_content_password, + param_content_user, + param_nocproxy, + param_password, + param_retry, + param_user, + realm); } else if (!strcmp((const char *) ptr->name, "records")) { @@ -1209,10 +1631,20 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( sprintf(*addinfo, "multiple records for udb=%s", database.c_str()); xmlFreeDoc(doc); - BackendPtr b; - return b; + return; } sptr = m_p->parse_torus_record(ptr); + connect_searchable(package, sptr, database, + error, addinfo, odr, + no_out_args, out_names, out_values, + content_proxy, proxy, + param_content_password, + param_content_user, + param_nocproxy, + param_password, + param_retry, + param_user, + realm); } } } @@ -1223,232 +1655,17 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( odr, 40 + strlen((const char *) ptr->name)); sprintf(*addinfo, "bad root element for torus: %s", ptr->name); xmlFreeDoc(doc); - BackendPtr b; - return b; + return; } } xmlFreeDoc(doc); } - if (!sptr) + if (m_backend_list.size() == 0) { *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; *addinfo = odr_strdup(odr, torus_db.c_str()); - BackendPtr b; - return b; - } - - xsltStylesheetPtr xsp = 0; - if (sptr->transform_xsl_content.length()) - { - xmlDoc *xsp_doc = xmlParseMemory(sptr->transform_xsl_content.c_str(), - sptr->transform_xsl_content.length()); - if (!xsp_doc) - { - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed " - "for literalTransform XSL"); - BackendPtr b; - return b; - } - xsp = xsltParseStylesheetDoc(xsp_doc); - if (!xsp) - { - *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; - *addinfo = - odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed " - "for literalTransform XSL"); - BackendPtr b; - xmlFreeDoc(xsp_doc); - return b; - } - } - else if (sptr->transform_xsl_fname.length()) - { - const char *path = 0; - - if (m_p->xsldir.length()) - path = m_p->xsldir.c_str(); - else - path = m_p->file_path.c_str(); - std::string fname; - - char fullpath[1024]; - char *cp = yaz_filepath_resolve(sptr->transform_xsl_fname.c_str(), - path, 0, fullpath); - if (cp) - fname.assign(cp); - else - { - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) - odr_malloc(odr, 40 + sptr->transform_xsl_fname.length()); - sprintf(*addinfo, "zoom: could not open file %s", - sptr->transform_xsl_fname.c_str()); - BackendPtr b; - return b; - } - xmlDoc *xsp_doc = xmlParseFile(fname.c_str()); - if (!xsp_doc) - { - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) odr_malloc(odr, 50 + fname.length()); - sprintf(*addinfo, "zoom: xmlParseFile failed for file %s", - fname.c_str()); - BackendPtr b; - return b; - } - xsp = xsltParseStylesheetDoc(xsp_doc); - if (!xsp) - { - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) odr_malloc(odr, 50 + fname.length()); - sprintf(*addinfo, "zoom: xsltParseStylesheetDoc failed " - "for file %s", fname.c_str()); - BackendPtr b; - xmlFreeDoc(xsp_doc); - return b; - } } - - cql_transform_t cqlt = 0; - if (sptr->rpn2cql_fname.length()) - { - char fullpath[1024]; - char *cp = yaz_filepath_resolve(sptr->rpn2cql_fname.c_str(), - m_p->file_path.c_str(), 0, fullpath); - if (cp) - cqlt = cql_transform_open_fname(fullpath); - } - else - cqlt = cql_transform_create(); - - if (!cqlt) - { - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file"); - BackendPtr b; - xsltFreeStylesheet(xsp); - return b; - } - - m_backend.reset(); - - BackendPtr b(new Backend); - - b->cqlt = cqlt; - b->sptr = sptr; - b->xsp = xsp; - b->m_frontend_database = database; - b->enable_cproxy = param_nocproxy ? false : true; - - if (sptr->query_encoding.length()) - b->set_option("rpnCharset", sptr->query_encoding); - - if (sptr->extraArgs.length()) - b->set_option("extraArgs", sptr->extraArgs); - - b->set_option("timeout", m_p->zoom_timeout.c_str()); - - if (m_p->apdu_log) - b->set_option("apdulog", "1"); - - if (sptr->piggyback && sptr->sru.length()) - b->set_option("count", "1"); /* some SRU servers INSIST on getting - maximumRecords > 0 */ - b->set_option("piggyback", sptr->piggyback ? "1" : "0"); - - if (authentication.length() == 0) - authentication = sptr->authentication; - - if (proxy.length() == 0) - proxy = sptr->cfProxy; - b->m_proxy = proxy; - - if (sptr->cfAuth.length()) - { - // A CF target - b->set_option("user", sptr->cfAuth); - if (authentication.length()) - { - size_t found = authentication.find('/'); - if (found != std::string::npos) - { - out_names[no_out_args] = "user"; - out_values[no_out_args++] = - odr_strdup(odr, authentication.substr(0, found).c_str()); - - out_names[no_out_args] = "password"; - out_values[no_out_args++] = - odr_strdup(odr, authentication.substr(found+1).c_str()); - } - else - { - out_names[no_out_args] = "user"; - out_values[no_out_args++] = - odr_strdup(odr, authentication.c_str()); - } - } - if (proxy.length()) - { - out_names[no_out_args] = "proxy"; - out_values[no_out_args++] = odr_strdup(odr, proxy.c_str()); - } - if (sptr->cfSubDB.length()) - { - out_names[no_out_args] = "subdatabase"; - out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDB.c_str()); - } - if (param_nocproxy) - { - out_names[no_out_args] = "nocproxy"; - out_values[no_out_args++] = odr_strdup(odr, param_nocproxy); - } - } - else - { - size_t found = authentication.find('/'); - - if (sptr->sru.length() && found != std::string::npos) - { - b->set_option("user", authentication.substr(0, found)); - b->set_option("password", authentication.substr(found+1)); - } - else - b->set_option("user", authentication); - - if (proxy.length()) - b->set_option("proxy", proxy); - } - std::string url(sptr->target); - if (sptr->sru.length()) - { - 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); - } - if (no_out_args) - { - char *x_args = 0; - out_names[no_out_args] = 0; // terminate list - - yaz_array_to_uri(&x_args, odr, (char **) out_names, - (char **) out_values); - url += "," + std::string(x_args); - } - package.log("zoom", YLOG_LOG, "url: %s", url.c_str()); - b->connect(url, error, addinfo, odr); - if (*error == 0 && b->enable_cproxy) - create_content_session(package, b, error, addinfo, odr, - content_authentication.length() ? - content_authentication : authentication, - content_proxy.length() ? content_proxy : proxy, - realm); - if (*error == 0) - m_backend = b; - return b; } void yf::Zoom::Frontend::prepare_elements(BackendPtr b, @@ -1565,7 +1782,7 @@ Z_Records *yf::Zoom::Frontend::get_explain_records( Z_NamePlusRecord *npr = (Z_NamePlusRecord *) odr_malloc(odr, sizeof(*npr)); - npr->databaseName = odr_strdup(odr, b->m_frontend_database.c_str()); + npr->databaseName = odr_strdup(odr, m_frontend_database.c_str()); npr->which = Z_NamePlusRecord_databaseRecord; npr->u.databaseRecord = z_ext_record_xml(odr, @@ -1628,8 +1845,19 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package, if (!*error) { for (i = 0; i < number_to_present; i++) + { if (!recs[i]) break; + + const char *addinfo; + int sur_error = ZOOM_record_error(recs[i], 0 /* msg */, + &addinfo, 0 /* diagset */); + if (sur_error == + YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS && addinfo && + !strcmp(addinfo, + "ZOOM C generated. Present phase and no records")) + break; + } } if (i > 0) { // only return records if no error and at least one record @@ -1652,15 +1880,14 @@ Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package, xsl_parms[0] = 0; } - char *odr_database = odr_strdup(odr, - b->m_frontend_database.c_str()); + char *odr_database = odr_strdup(odr, m_frontend_database.c_str()); Z_NamePlusRecordList *npl = (Z_NamePlusRecordList *) odr_malloc(odr, sizeof(*npl)); *number_of_records_returned = i; npl->num_records = i; npl->records = (Z_NamePlusRecord **) odr_malloc(odr, i * sizeof(*npl->records)); - for (i = 0; i < number_to_present; i++) + for (i = 0; i < npl->num_records; i++) { Z_NamePlusRecord *npr = 0; const char *addinfo; @@ -1879,21 +2106,18 @@ void yf::Zoom::Frontend::log_diagnostic(mp::Package &package, error, err_msg); } -yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, - std::string &database, - int *error, - char **addinfo, - mp::odr &odr, - std::string torus_url, - std::string &torus_db, - std::string &realm) +void yf::Zoom::Frontend::explain_search(mp::Package &package, + std::string &database, + int *error, + char **addinfo, + mp::odr &odr, + std::string torus_url, + std::string &torus_db, + std::string &realm) { - m_backend.reset(); - BackendPtr b(new Backend); - b->m_frontend_database = database; - b->enable_explain = true; + enable_explain = true; Z_GDU *gdu = package.request().get(); Z_APDU *apdu_req = gdu->u.z3950; @@ -1906,15 +2130,17 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, *addinfo = odr_strdup(odr, "IR-Explain---1 unsupported. " "Torus explain_xsl not defined"); - return m_backend; + return; } 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); @@ -1925,8 +2151,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, 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 { @@ -1938,18 +2164,16 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, Z_APDU *apdu_res = odr.create_searchResponse(apdu_req, 0, 0); apdu_res->u.searchResponse->resultCount = odr_intdup(odr, hits); package.response() = apdu_res; - m_backend = b; + m_backend_list.push_back(b); } if (b->explain_doc) xmlFreeDoc(b->explain_doc); b->explain_doc = doc; - return m_backend; } else { *error = YAZ_BIB1_QUERY_TYPE_UNSUPP; *addinfo = odr_strdup(odr, "IR-Explain---1 only supports CQL"); - return m_backend; } } @@ -1958,7 +2182,7 @@ static bool wait_conn(COMSTACK cs, int secs) struct yaz_poll_fd pfd; yaz_poll_add(pfd.input_mask, yaz_poll_except); - if (cs->io_pending && CS_WANT_WRITE) + if (cs->io_pending & CS_WANT_WRITE) yaz_poll_add(pfd.input_mask, yaz_poll_write); if (cs->io_pending & CS_WANT_READ) yaz_poll_add(pfd.input_mask, yaz_poll_read); @@ -2020,7 +2244,7 @@ bool yf::Zoom::Frontend::retry(mp::Package &package, { log_diagnostic(package, error, *addinfo); package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str()); - m_backend.reset(); + m_backend_list.clear(); if (proxy_step) // there is a failover { proxy_retries++; @@ -2030,12 +2254,13 @@ bool yf::Zoom::Frontend::retry(mp::Package &package, error = YAZ_BIB1_PROXY_FAILURE; *addinfo = odr_strdup(odr, b->m_proxy.c_str()); } - else if (same_retries == 0 && proxy_retries == 0) + else if (b && b->retry_on_failure.compare("0") + && same_retries == 0 && proxy_retries == 0) { log_diagnostic(package, error, *addinfo); same_retries++; package.log("zoom", YLOG_WARN, "search failed: retry"); - m_backend.reset(); + m_backend_list.clear(); proxy_step = 0; return true; } @@ -2067,10 +2292,12 @@ next_proxy: char *addinfo = 0; std::string db(sr->databaseNames[0]); - BackendPtr b = get_backend_from_databases(package, db, &error, - &addinfo, odr, &proxy_step); - if (error) + get_backend_from_databases(package, db, &error, + &addinfo, odr, &proxy_step); + if (error && m_backend_list.size() == 1) { + std::list::iterator it = m_backend_list.begin(); + BackendPtr b = *it; if (retry(package, odr, b, error, &addinfo, proxy_step, same_retries, proxy_retries)) goto next_proxy; @@ -2082,265 +2309,259 @@ next_proxy: package.response() = apdu_res; return; } - if (!b || b->enable_explain) + if (m_backend_list.size() == 0 || enable_explain) return; - b->set_option("setname", "default"); - - bool enable_pz2_retrieval = false; - bool enable_pz2_transform = false; - bool enable_record_transform = false; - bool assume_marc8_charset = false; - prepare_elements(b, sr->preferredRecordSyntax, 0 /*element_set_name */, - enable_pz2_retrieval, - enable_pz2_transform, - enable_record_transform, - assume_marc8_charset); + std::list::iterator it = m_backend_list.begin(); + for (; it != m_backend_list.end(); it++) + { + BackendPtr b = *it; + b->set_option("setname", "default"); - Odr_int hits = 0; - Z_Query *query = sr->query; - mp::wrbuf ccl_wrbuf; - mp::wrbuf pqf_wrbuf; - std::string sortkeys; + bool enable_pz2_retrieval = false; + bool enable_pz2_transform = false; + bool enable_record_transform = false; + bool assume_marc8_charset = false; + prepare_elements(b, sr->preferredRecordSyntax, 0 /*element_set_name */, + enable_pz2_retrieval, + enable_pz2_transform, + enable_record_transform, + assume_marc8_charset); - if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101) - { - // RPN - yaz_rpnquery_to_wrbuf(pqf_wrbuf, query->u.type_1); - } - else if (query->which == Z_Query_type_2) - { - // CCL - wrbuf_write(ccl_wrbuf, (const char *) query->u.type_2->buf, - query->u.type_2->len); - } - else if (query->which == Z_Query_type_104 && - query->u.type_104->which == Z_External_CQL) - { - // CQL - const char *cql = query->u.type_104->u.cql; - CQL_parser cp = cql_parser_create(); - int r = cql_parser_string(cp, cql); - package.log("zoom", YLOG_LOG, "CQL: %s", cql); - if (r) - { - cql_parser_destroy(cp); - error = YAZ_BIB1_MALFORMED_QUERY; - const char *addinfo = "CQL syntax error"; - log_diagnostic(package, error, addinfo); - apdu_res = - odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - return; - } - struct cql_node *cn = cql_parser_result(cp); - struct cql_node *cn_error = m_p->convert_cql_fields(cn, odr); - if (cn_error) - { - // hopefully we are getting a ptr to a index+relation+term node - error = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; - addinfo = 0; - if (cn_error->which == CQL_NODE_ST) - addinfo = cn_error->u.st.index; + Odr_int hits = 0; + Z_Query *query = sr->query; + mp::wrbuf ccl_wrbuf; + mp::wrbuf pqf_wrbuf; + std::string sortkeys; - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - cql_parser_destroy(cp); - return; - } - r = cql_to_ccl(cn, wrbuf_vp_puts, ccl_wrbuf); - if (r) + if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101) { - error = YAZ_BIB1_MALFORMED_QUERY; - const char *addinfo = "CQL to CCL conversion error"; - - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - cql_parser_destroy(cp); - return; + // RPN + yaz_rpnquery_to_wrbuf(pqf_wrbuf, query->u.type_1); } - - mp::wrbuf sru_sortkeys_wrbuf; - if (cql_sortby_to_sortkeys(cn, wrbuf_vp_puts, sru_sortkeys_wrbuf)) + else if (query->which == Z_Query_type_2) { - error = YAZ_BIB1_ILLEGAL_SORT_RELATION; - const char *addinfo = "CQL to CCL sortby conversion"; - - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - cql_parser_destroy(cp); - return; + // CCL + wrbuf_write(ccl_wrbuf, (const char *) query->u.type_2->buf, + query->u.type_2->len); } - mp::wrbuf sort_spec_wrbuf; - yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf), - 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)); - yaz_tok_cfg_destroy(tc); - - /* go through sortspec and map fields */ - int token = yaz_tok_move(tp); - while (token != YAZ_TOK_EOF) + else if (query->which == Z_Query_type_104 && + query->u.type_104->which == Z_External_CQL) { - if (token == YAZ_TOK_STRING) + // CQL + const char *cql = query->u.type_104->u.cql; + CQL_parser cp = cql_parser_create(); + int r = cql_parser_string(cp, cql); + package.log("zoom", YLOG_LOG, "CQL: %s", cql); + if (r) { - const char *field = yaz_tok_parse_string(tp); - std::map::iterator it; - it = b->sptr->sortmap.find(field); - if (it != b->sptr->sortmap.end()) - sortkeys += it->second; - else - sortkeys += field; + cql_parser_destroy(cp); + error = YAZ_BIB1_MALFORMED_QUERY; + const char *addinfo = "CQL syntax error"; + log_diagnostic(package, error, addinfo); + apdu_res = + odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + return; + } + struct cql_node *cn = cql_parser_result(cp); + struct cql_node *cn_error = m_p->convert_cql_fields(cn, odr); + if (cn_error) + { + // hopefully we are getting a ptr to a index+relation+term node + error = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; + addinfo = 0; + if (cn_error->which == CQL_NODE_ST) + addinfo = cn_error->u.st.index; + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + cql_parser_destroy(cp); + return; + } + r = cql_to_ccl(cn, wrbuf_vp_puts, ccl_wrbuf); + if (r) + { + error = YAZ_BIB1_MALFORMED_QUERY; + const char *addinfo = "CQL to CCL conversion error"; + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + cql_parser_destroy(cp); + return; } - sortkeys += " "; - token = yaz_tok_move(tp); - if (token == YAZ_TOK_STRING) + mp::wrbuf sru_sortkeys_wrbuf; + if (cql_sortby_to_sortkeys(cn, wrbuf_vp_puts, sru_sortkeys_wrbuf)) { - sortkeys += yaz_tok_parse_string(tp); + error = YAZ_BIB1_ILLEGAL_SORT_RELATION; + const char *addinfo = "CQL to CCL sortby conversion"; + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + cql_parser_destroy(cp); + return; } - if (token != YAZ_TOK_EOF) + mp::wrbuf sort_spec_wrbuf; + yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf), + 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)); + yaz_tok_cfg_destroy(tc); + /* go through sortspec and map fields */ + int token = yaz_tok_move(tp); + while (token != YAZ_TOK_EOF) { + if (token == YAZ_TOK_STRING) + { + const char *field = yaz_tok_parse_string(tp); + std::map::iterator it; + it = b->sptr->sortmap.find(field); + if (it != b->sptr->sortmap.end()) + sortkeys += it->second; + else + sortkeys += field; + } sortkeys += " "; token = yaz_tok_move(tp); + if (token == YAZ_TOK_STRING) + { + sortkeys += yaz_tok_parse_string(tp); + } + if (token != YAZ_TOK_EOF) + { + sortkeys += " "; + token = yaz_tok_move(tp); + } } + yaz_tok_parse_destroy(tp); + cql_parser_destroy(cp); } - yaz_tok_parse_destroy(tp); - cql_parser_destroy(cp); - } - else - { - error = YAZ_BIB1_QUERY_TYPE_UNSUPP; - const char *addinfo = 0; - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - return; - } - - if (ccl_wrbuf.len()) - { - // CCL to PQF - assert(pqf_wrbuf.len() == 0); - int cerror, cpos; - struct ccl_rpn_node *cn; - package.log("zoom", YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf)); - cn = ccl_find_str(b->sptr->ccl_bibset, wrbuf_cstr(ccl_wrbuf), - &cerror, &cpos); - if (!cn) + else { - char *addinfo = odr_strdup_null(odr, ccl_err_msg(cerror)); - error = YAZ_BIB1_MALFORMED_QUERY; - - switch (cerror) + error = YAZ_BIB1_QUERY_TYPE_UNSUPP; + const char *addinfo = 0; + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + return; + } + if (ccl_wrbuf.len()) + { + // CCL to PQF + assert(pqf_wrbuf.len() == 0); + int cerror, cpos; + struct ccl_rpn_node *cn; + package.log("zoom", YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf)); + cn = ccl_find_str(b->sptr->ccl_bibset, wrbuf_cstr(ccl_wrbuf), + &cerror, &cpos); + if (!cn) { - case CCL_ERR_UNKNOWN_QUAL: - case CCL_ERR_TRUNC_NOT_LEFT: - case CCL_ERR_TRUNC_NOT_RIGHT: - case CCL_ERR_TRUNC_NOT_BOTH: + char *addinfo = odr_strdup_null(odr, ccl_err_msg(cerror)); + error = YAZ_BIB1_MALFORMED_QUERY; + switch (cerror) + { + case CCL_ERR_UNKNOWN_QUAL: + case CCL_ERR_TRUNC_NOT_LEFT: + case CCL_ERR_TRUNC_NOT_RIGHT: + case CCL_ERR_TRUNC_NOT_BOTH: #ifdef CCL_ERR_TRUNC_NOT_EMBED - case CCL_ERR_TRUNC_NOT_EMBED: + case CCL_ERR_TRUNC_NOT_EMBED: #endif #ifdef CCL_ERR_TRUNC_NOT_SINGLE - case CCL_ERR_TRUNC_NOT_SINGLE: + case CCL_ERR_TRUNC_NOT_SINGLE: #endif - error = YAZ_BIB1_UNSUPP_SEARCH; - break; + error = YAZ_BIB1_UNSUPP_SEARCH; + break; + } + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + package.response() = apdu_res; + return; } - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - return; - } - ccl_pquery(pqf_wrbuf, cn); - package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf)); - ccl_rpn_delete(cn); - } - - assert(pqf_wrbuf.len()); - - ZOOM_query q = ZOOM_query_create(); - ZOOM_query_sortby2(q, b->sptr->sortStrategy.c_str(), sortkeys.c_str()); - - if (b->get_option("sru")) - { - int status = 0; - Z_RPNQuery *zquery; - zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf)); - mp::wrbuf wrb; - - 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); + ccl_pquery(pqf_wrbuf, cn); + package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf)); + ccl_rpn_delete(cn); + } + assert(pqf_wrbuf.len()); + 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")) + { + Z_RPNQuery *zquery; + zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf)); + mp::wrbuf wrb_cql; + mp::wrbuf wrb_addinfo; + if (!strcmp(b->get_option("sru"), "solr")) + 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) + { + 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 { - 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, odr); - } - ZOOM_query_destroy(q); - - if (status) - { - error = YAZ_BIB1_MALFORMED_QUERY; - const char *addinfo = "can not convert from RPN to CQL/Solr"; + 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); + } + if (error && m_backend_list.size() == 1) + { + if (retry(package, odr, b, error, &addinfo, proxy_step, + same_retries, proxy_retries)) + goto next_proxy; + } + const char *element_set_name = 0; + Odr_int number_to_present = 0; + if (!error) + mp::util::piggyback_sr(sr, hits, + number_to_present, &element_set_name); + Odr_int number_of_records_returned = 0; + Z_Records *records = get_records( + package, + 0, number_to_present, &error, &addinfo, + &number_of_records_returned, odr, b, sr->preferredRecordSyntax, + element_set_name); + if (error) log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - package.response() = apdu_res; - return; + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); + if (records) + { + apdu_res->u.searchResponse->records = records; + apdu_res->u.searchResponse->numberOfRecordsReturned = + 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; } - else - { - 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); - ZOOM_query_destroy(q); - } - - if (error) - { - if (retry(package, odr, b, error, &addinfo, proxy_step, - same_retries, proxy_retries)) - goto next_proxy; - } - - const char *element_set_name = 0; - Odr_int number_to_present = 0; - if (!error) - mp::util::piggyback_sr(sr, hits, number_to_present, &element_set_name); - - Odr_int number_of_records_returned = 0; - Z_Records *records = get_records( - package, - 0, number_to_present, &error, &addinfo, - &number_of_records_returned, odr, b, sr->preferredRecordSyntax, - element_set_name); - if (error) - log_diagnostic(package, error, addinfo); - apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); - if (records) - { - apdu_res->u.searchResponse->records = records; - apdu_res->u.searchResponse->numberOfRecordsReturned = - odr_intdup(odr, number_of_records_returned); - } - apdu_res->u.searchResponse->resultCount = odr_intdup(odr, hits); - package.response() = apdu_res; } +#if 0 void yf::Zoom::Frontend::handle_present(mp::Package &package) { Z_GDU *gdu = package.request().get(); @@ -2406,6 +2627,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package) package.response() = apdu_res; } } +#endif void yf::Zoom::Frontend::handle_package(mp::Package &package) { @@ -2415,9 +2637,9 @@ void yf::Zoom::Frontend::handle_package(mp::Package &package) else if (gdu->which == Z_GDU_Z3950) { Z_APDU *apdu_req = gdu->u.z3950; - - if (m_backend) - wrbuf_rewind(m_backend->m_apdu_wrbuf); + std::list::iterator it; + for (it = m_backend_list.begin(); it != m_backend_list.end(); it++) + wrbuf_rewind((*it)->m_apdu_wrbuf); if (apdu_req->which == Z_APDU_initRequest) { mp::odr odr; @@ -2430,10 +2652,12 @@ void yf::Zoom::Frontend::handle_package(mp::Package &package) { handle_search(package); } +#if 0 else if (apdu_req->which == Z_APDU_presentRequest) { handle_present(package); } +#endif else { mp::odr odr; @@ -2443,9 +2667,9 @@ void yf::Zoom::Frontend::handle_package(mp::Package &package) "zoom filter cannot handle this APDU"); package.session().close(); } - if (m_backend) + for (it = m_backend_list.begin(); it != m_backend_list.end(); it++) { - WRBUF w = m_backend->m_apdu_wrbuf; + WRBUF w = (*it)->m_apdu_wrbuf; package.log_write(wrbuf_buf(w), wrbuf_len(w)); } } @@ -2502,9 +2726,32 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req, } } - std::string ip = package.origin().get_address(); + Z_OtherInformation **oi = &req->otherInfo; + const char *ip_cstr = + yaz_oi_get_string_oid(oi, yaz_oid_userinfo_client_ip, 1, 0); + std::string ip; + if (ip_cstr) + ip = ip_cstr; + else + ip = package.origin().get_address(); + yaz_log(YLOG_LOG, "IP=%s", ip.c_str()); + { + NMEM nmem = nmem_create(); + char **darray; + int i, num; + nmem_strsplit_blank(nmem, m_p->torus_allow_ip.c_str(), &darray, &num); + for (i = 0; i < num; i++) + { + yaz_log(YLOG_LOG, "check against %s+%s", darray[i], ip.c_str()); + if (yaz_match_glob(darray[i], ip.c_str())) + break; + } + nmem_destroy(nmem); + if (i < num) + return; /* allow this IP */ + } std::string torus_query; int failure_code; @@ -2516,27 +2763,31 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req, } 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 = "ipRanges encloses/net.ipaddress \""; + torus_query += escape_cql_term(std::string(ip)); torus_query += "\""; + + if (m_p->torus_auth_hostname.length()) + { + torus_query += " AND hostName == \""; + torus_query += escape_cql_term(m_p->torus_auth_hostname); + 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);