X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=78aa9c8bb486e7bd3ea39af2bd73b51bcca12730;hb=refs%2Fheads%2Fmp-593;hp=2062b1c0ce5621b57314403680fc9fbfabef1646;hpb=f3e215cc00b02e3d92016f095295af2ba4649e2f;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index 2062b1c..78aa9c8 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -52,6 +52,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include namespace mp = metaproxy_1; namespace yf = mp::filter; @@ -62,6 +63,7 @@ namespace metaproxy_1 { public: std::string authentication; std::string authenticationMode; + std::string contentAuthentication; std::string cfAuth; std::string cfProxy; std::string cfSubDB; @@ -80,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; @@ -90,19 +93,17 @@ 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(); @@ -123,30 +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, @@ -218,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; @@ -294,7 +316,6 @@ yf::Zoom::Backend::Backend() m_resultset = 0; xsp = 0; enable_cproxy = true; - enable_explain = false; explain_doc = 0; cqlt = 0; } @@ -488,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); } @@ -497,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) { } @@ -590,6 +612,11 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) 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); @@ -699,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; } @@ -776,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")) @@ -1092,234 +1128,24 @@ bool yf::Zoom::Frontend::create_content_session(mp::Package &package, return true; } -yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( - mp::Package &package, - std::string &database, int *error, char **addinfo, mp::odr &odr, - int *proxy_step) +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) { - bool connection_reuse = false; - std::string proxy; - - std::list::const_iterator map_it; - if (m_backend && !m_backend->enable_explain && - m_backend->m_frontend_database == database) - { - connection_reuse = true; - proxy = m_backend->m_proxy; - } - - std::string input_args; - std::string torus_db; - size_t db_arg_pos = database.find(','); - if (db_arg_pos != std::string::npos) - { - torus_db = database.substr(0, db_arg_pos); - input_args = database.substr(db_arg_pos + 1); - } - else - torus_db = database; - - std::string authentication; - std::string content_authentication; - std::string content_proxy; - std::string realm = session_realm; - if (realm.length() == 0) - realm = m_p->default_realm; - - const char *param_user = 0; - const char *param_password = 0; - const char *param_content_user = 0; - const char *param_content_password = 0; - const char *param_nocproxy = 0; - int no_parms = 0; - - char **names; - char **values; - int no_out_args = 0; - if (input_args.length()) - no_parms = yaz_uri_to_array(input_args.c_str(), - odr, &names, &values); - // adding 10 because we'll be adding other URL args - const char **out_names = (const char **) - odr_malloc(odr, (10 + no_parms) * sizeof(*out_names)); - const char **out_values = (const char **) - odr_malloc(odr, (10 + no_parms) * sizeof(*out_values)); - - // may be changed if it's a content connection - std::string torus_url = m_p->torus_searchable_url; - int i; - for (i = 0; i < no_parms; i++) - { - const char *name = names[i]; - const char *value = values[i]; - assert(name); - assert(value); - if (!strcmp(name, "user")) - param_user = value; - else if (!strcmp(name, "password")) - param_password = value; - else if (!strcmp(name, "content-user")) - param_content_user = value; - else if (!strcmp(name, "content-password")) - param_content_password = value; - else if (!strcmp(name, "content-proxy")) - content_proxy = value; - else if (!strcmp(name, "nocproxy")) - param_nocproxy = value; - else if (!strcmp(name, "proxy")) - { - char **dstr; - int dnum = 0; - nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum); - if (connection_reuse) - { - // find the step after our current proxy - int i; - for (i = 0; i < dnum; i++) - if (!strcmp(proxy.c_str(), dstr[i])) - break; - if (i >= dnum - 1) - *proxy_step = 0; - else - *proxy_step = i + 1; - } - else - { - // step is known.. Guess our proxy from it - if (*proxy_step >= dnum) - *proxy_step = 0; - else - { - proxy = dstr[*proxy_step]; - - (*proxy_step)++; - if (*proxy_step == dnum) - *proxy_step = 0; - } - } - } - else if (!strcmp(name, "cproxysession")) - { - out_names[no_out_args] = name; - out_values[no_out_args++] = value; - torus_url = m_p->torus_content_url; - } - else if (!strcmp(name, "realm") && session_realm.length() == 0) - realm = value; - else if (!strcmp(name, "torus_url") && session_realm.length() == 0) - torus_url = value; - else if (name[0] == 'x' && name[1] == '-') - { - out_names[no_out_args] = name; - out_values[no_out_args++] = value; - } - else - { - BackendPtr notfound; - char *msg = (char*) odr_malloc(odr, strlen(name) + 30); - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - sprintf(msg, "zoom: bad database argument: %s", name); - *addinfo = msg; - return notfound; - } - } - if (proxy.length()) - package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str()); - - if (connection_reuse) - { - m_backend->connect("", error, addinfo, odr); - return m_backend; - } - - 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); - } - - if (torus_db.compare("IR-Explain---1") == 0) - return explain_search(package, database, error, addinfo, odr, torus_url, - torus_db, realm); - - SearchablePtr sptr; - - std::map::iterator it; - it = m_p->s_map.find(torus_db); - if (it != m_p->s_map.end()) - sptr = it->second; - else if (torus_url.length() > 0) - { - std::string torus_query = "udb==" + torus_db; - xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db, - torus_query, - realm, m_p->proxy); - if (!doc) - { - *error = YAZ_BIB1_UNSPECIFIED_ERROR; - *addinfo = odr_strdup(odr, "Torus server unavailable or " - "incorrectly configured"); - BackendPtr b; - return b; - } - const xmlNode *ptr = xmlDocGetRootElement(doc); - if (ptr && ptr->type == XML_ELEMENT_NODE) - { - if (!strcmp((const char *) ptr->name, "record")) - { - sptr = m_p->parse_torus_record(ptr); - } - else if (!strcmp((const char *) ptr->name, "records")) - { - for (ptr = ptr->children; ptr; ptr = ptr->next) - { - if (ptr->type == XML_ELEMENT_NODE - && !strcmp((const char *) ptr->name, "record")) - { - if (sptr) - { - *error = YAZ_BIB1_UNSPECIFIED_ERROR; - *addinfo = (char*) - odr_malloc(odr, 40 + torus_db.length()); - sprintf(*addinfo, "multiple records for udb=%s", - database.c_str()); - xmlFreeDoc(doc); - BackendPtr b; - return b; - } - sptr = m_p->parse_torus_record(ptr); - } - } - } - else - { - *error = YAZ_BIB1_UNSPECIFIED_ERROR; - *addinfo = (char*) odr_malloc( - odr, 40 + strlen((const char *) ptr->name)); - sprintf(*addinfo, "bad root element for torus: %s", ptr->name); - xmlFreeDoc(doc); - BackendPtr b; - return b; - } - } - xmlFreeDoc(doc); - } - - if (!sptr) - { - *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()) { @@ -1330,8 +1156,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; *addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed " "for literalTransform XSL"); - BackendPtr b; - return b; + return; } xsp = xsltParseStylesheetDoc(xsp_doc); if (!xsp) @@ -1340,9 +1165,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( *addinfo = odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed " "for literalTransform XSL"); - BackendPtr b; xmlFreeDoc(xsp_doc); - return b; + return; } } else if (sptr->transform_xsl_fname.length()) @@ -1367,8 +1191,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( 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; + return; } xmlDoc *xsp_doc = xmlParseFile(fname.c_str()); if (!xsp_doc) @@ -1377,8 +1200,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( *addinfo = (char *) odr_malloc(odr, 50 + fname.length()); sprintf(*addinfo, "zoom: xmlParseFile failed for file %s", fname.c_str()); - BackendPtr b; - return b; + return; } xsp = xsltParseStylesheetDoc(xsp_doc); if (!xsp) @@ -1387,9 +1209,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( *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; + return; } } @@ -1409,21 +1230,22 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( { *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; *addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file"); - BackendPtr b; xsltFreeStylesheet(xsp); - return b; + return; } - 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 (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); @@ -1439,8 +1261,20 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( maximumRecords > 0 */ b->set_option("piggyback", sptr->piggyback ? "1" : "0"); - if (authentication.length() == 0) - authentication = sptr->authentication; + 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; @@ -1450,7 +1284,17 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( { // A CF target b->set_option("user", sptr->cfAuth); - if (authentication.length()) + 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) @@ -1549,17 +1393,288 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( content_proxy.length() ? content_proxy : proxy, realm); if (*error == 0) - m_backend = b; - return b; + { + m_backend_list.push_back(b); + } } -void yf::Zoom::Frontend::prepare_elements(BackendPtr b, - Odr_oid *preferredRecordSyntax, - const char *element_set_name, - bool &enable_pz2_retrieval, - bool &enable_pz2_transform, - bool &enable_record_transform, - bool &assume_marc8_charset) +void yf::Zoom::Frontend::get_backend_from_databases( + mp::Package &package, + std::string &database, int *error, char **addinfo, mp::odr &odr, + int *proxy_step) +{ + std::string proxy; + bool connection_reuse = false; + + if (m_backend_list.size() > 0 && !enable_explain && + m_frontend_database == database) + { + // TODO !! proxy = m_backend->m_proxy; + connection_reuse = true; + } + + std::string input_args; + std::string torus_db; + size_t db_arg_pos = database.find(','); + if (db_arg_pos != std::string::npos) + { + torus_db = database.substr(0, db_arg_pos); + input_args = database.substr(db_arg_pos + 1); + } + else + torus_db = database; + + std::string content_proxy; + std::string realm = session_realm; + if (realm.length() == 0) + realm = m_p->default_realm; + + const char *param_user = 0; + const char *param_password = 0; + 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; + char **values; + int no_out_args = 0; + if (input_args.length()) + no_parms = yaz_uri_to_array(input_args.c_str(), + odr, &names, &values); + // adding 10 because we'll be adding other URL args + const char **out_names = (const char **) + odr_malloc(odr, (10 + no_parms) * sizeof(*out_names)); + const char **out_values = (const char **) + odr_malloc(odr, (10 + no_parms) * sizeof(*out_values)); + + // may be changed if it's a content connection + std::string torus_url = m_p->torus_searchable_url; + int i; + for (i = 0; i < no_parms; i++) + { + const char *name = names[i]; + const char *value = values[i]; + assert(name); + assert(value); + if (!strcmp(name, "user")) + param_user = value; + else if (!strcmp(name, "password")) + param_password = value; + else if (!strcmp(name, "content-user")) + param_content_user = value; + else if (!strcmp(name, "content-password")) + param_content_password = value; + else if (!strcmp(name, "content-proxy")) + 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; + int dnum = 0; + nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum); + if (connection_reuse) + { + // find the step after our current proxy + int i; + for (i = 0; i < dnum; i++) + if (!strcmp(proxy.c_str(), dstr[i])) + break; + if (i >= dnum - 1) + *proxy_step = 0; + else + *proxy_step = i + 1; + } + else + { + // step is known.. Guess our proxy from it + if (*proxy_step >= dnum) + *proxy_step = 0; + else + { + proxy = dstr[*proxy_step]; + + (*proxy_step)++; + if (*proxy_step == dnum) + *proxy_step = 0; + } + } + } + else if (!strcmp(name, "cproxysession")) + { + out_names[no_out_args] = name; + out_values[no_out_args++] = value; + torus_url = m_p->torus_content_url; + } + else if (!strcmp(name, "realm") && session_realm.length() == 0) + realm = value; + else if (!strcmp(name, "torus_url") && session_realm.length() == 0) + torus_url = value; + else if (name[0] == 'x' && name[1] == '-') + { + out_names[no_out_args] = name; + out_values[no_out_args++] = value; + } + else + { + BackendPtr notfound; + char *msg = (char*) odr_malloc(odr, strlen(name) + 30); + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + sprintf(msg, "zoom: bad database argument: %s", name); + *addinfo = msg; + return; + } + } + if (proxy.length()) + package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str()); + + if (connection_reuse) + { + std::list::iterator it = m_backend_list.begin(); + for (; it != m_backend_list.end(); it++) + (*it)->connect("", error, addinfo, odr); + return; + } + + 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, + torus_addinfo); + if (!doc) + { + *error = YAZ_BIB1_UNSPECIFIED_ERROR; + 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) + { + 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")) + { + for (ptr = ptr->children; ptr; ptr = ptr->next) + { + if (ptr->type == XML_ELEMENT_NODE + && !strcmp((const char *) ptr->name, "record")) + { + if (sptr) + { + *error = YAZ_BIB1_UNSPECIFIED_ERROR; + *addinfo = (char*) + odr_malloc(odr, 40 + torus_db.length()); + sprintf(*addinfo, "multiple records for udb=%s", + database.c_str()); + xmlFreeDoc(doc); + 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); + } + } + } + else + { + *error = YAZ_BIB1_UNSPECIFIED_ERROR; + *addinfo = (char*) odr_malloc( + odr, 40 + strlen((const char *) ptr->name)); + sprintf(*addinfo, "bad root element for torus: %s", ptr->name); + xmlFreeDoc(doc); + return; + } + } + xmlFreeDoc(doc); + } + + if (m_backend_list.size() == 0) + { + *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; + *addinfo = odr_strdup(odr, torus_db.c_str()); + } +} + +void yf::Zoom::Frontend::prepare_elements(BackendPtr b, + Odr_oid *preferredRecordSyntax, + const char *element_set_name, + bool &enable_pz2_retrieval, + bool &enable_pz2_transform, + bool &enable_record_transform, + bool &assume_marc8_charset) { char oid_name_str[OID_STR_MAX]; const char *syntax_name = 0; @@ -1667,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, @@ -1730,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 @@ -1754,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; @@ -1981,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; @@ -2008,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); @@ -2027,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 { @@ -2040,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; } } @@ -2060,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); @@ -2122,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++; @@ -2132,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; } @@ -2169,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; @@ -2184,276 +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; } - sortkeys += " "; - token = yaz_tok_move(tp); - if (token == YAZ_TOK_STRING) + struct cql_node *cn = cql_parser_result(cp); + struct cql_node *cn_error = m_p->convert_cql_fields(cn, odr); + if (cn_error) { - sortkeys += yaz_tok_parse_string(tp); + // 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; } - if (token != YAZ_TOK_EOF) + 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; + } + mp::wrbuf sru_sortkeys_wrbuf; + if (cql_sortby_to_sortkeys(cn, wrbuf_vp_puts, sru_sortkeys_wrbuf)) + { + 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; + } + 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()); - - 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; - 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)); + 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 (status) - { - error = YAZ_BIB1_MALFORMED_QUERY; - const char *addinfo = "can not convert from RPN to CQL/Solr"; + 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, &fl, 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); - if (fl) - yaz_oi_set_facetlist(&apdu_res->u.searchResponse->additionalSearchInfo, - odr, fl); - package.response() = apdu_res; } +#if 0 void yf::Zoom::Frontend::handle_present(mp::Package &package) { Z_GDU *gdu = package.request().get(); @@ -2519,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) { @@ -2528,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; @@ -2543,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; @@ -2556,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)); } } @@ -2616,13 +2727,31 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req, } Z_OtherInformation **oi = &req->otherInfo; - const char *ip = + const char *ip_cstr = yaz_oi_get_string_oid(oi, yaz_oid_userinfo_client_ip, 1, 0); - if (!ip) - ip = package.origin().get_address().c_str(); + std::string ip; + if (ip_cstr) + ip = ip_cstr; + else + ip = package.origin().get_address(); - yaz_log(YLOG_LOG, "IP=%s", ip); + 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; @@ -2634,22 +2763,31 @@ void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req, } else { - torus_query = "ip encloses/net.ipaddress \""; + 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);