X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=b337b60c692edf1e84ebbc76959165bcd349919b;hb=dd21227b80709993b132d073d3276e875f54fca4;hp=194fb8bcb70496726ab89f57d39b89394209e6ec;hpb=53f4ad9ff2a693396570c9374f24b4b1b6023e64;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index 194fb8b..b337b60 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -76,6 +76,7 @@ namespace metaproxy_1 { std::string urlRecipe; std::string contentConnector; std::string sortStrategy; + std::string rpn2cql_fname; bool use_turbomarc; bool piggyback; CCL_bibset ccl_bibset; @@ -98,6 +99,7 @@ namespace metaproxy_1 { bool enable_explain; xmlDoc *explain_doc; std::string m_proxy; + cql_transform_t cqlt; public: Backend(); ~Backend(); @@ -127,6 +129,7 @@ namespace metaproxy_1 { int *error, char **addinfo, mp::odr &odr, + std::string torus_url, std::string &torus_db, std::string &realm); void handle_present(mp::Package &package); @@ -292,6 +295,7 @@ yf::Zoom::Backend::~Backend() xsltFreeStylesheet(xsp); if (explain_doc) xmlFreeDoc(explain_doc); + cql_transform_close(cqlt); ZOOM_connection_destroy(m_connection); ZOOM_resultset_destroy(m_resultset); } @@ -593,6 +597,8 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) { s->sortStrategy = mp::xml::get_text(ptr); } + else if (!strcmp((const char *) ptr->name, "rpn2cql")) + s->rpn2cql_fname = mp::xml::get_text(ptr); } return s; } @@ -1094,6 +1100,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( } else if (!strcmp(name, "realm")) realm = value; + else if (!strcmp(name, "torus_url")) + torus_url = value; else if (name[0] == 'x' && name[1] == '-') { out_names[no_out_args] = name; @@ -1132,8 +1140,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( } if (torus_db.compare("IR-Explain---1") == 0) - return explain_search(package, database, error, addinfo, odr, torus_db, - realm); + return explain_search(package, database, error, addinfo, odr, torus_url, + torus_db, realm); SearchablePtr sptr; @@ -1149,8 +1157,9 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( realm, m_p->proxy); if (!doc) { - *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; - *addinfo = odr_strdup(odr, torus_db.c_str()); + *error = YAZ_BIB1_UNSPECIFIED_ERROR; + *addinfo = odr_strdup(odr, "Torus server unavailable or " + "incorrectly configured"); BackendPtr b; return b; } @@ -1256,11 +1265,32 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( } } + 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, "Missing/invalid cql2rpn file"); + BackendPtr b; + xsltFreeStylesheet(xsp); + return b; + } + m_backend.reset(); BackendPtr b(new Backend); - b->m_proxy = proxy; + b->cqlt = cqlt; b->sptr = sptr; b->xsp = xsp; b->m_frontend_database = database; @@ -1284,6 +1314,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (proxy.length() == 0) proxy = sptr->cfProxy; + b->m_proxy = proxy; if (sptr->cfAuth.length()) { @@ -1443,7 +1474,7 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b, } Z_Records *yf::Zoom::Frontend::get_explain_records( - Package &package, + mp::Package &package, Odr_int start, Odr_int number_to_present, int *error, @@ -1502,7 +1533,7 @@ Z_Records *yf::Zoom::Frontend::get_explain_records( } -Z_Records *yf::Zoom::Frontend::get_records(Package &package, +Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package, Odr_int start, Odr_int number_to_present, int *error, @@ -1802,6 +1833,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, int *error, char **addinfo, mp::odr &odr, + std::string torus_url, std::string &torus_db, std::string &realm) { @@ -1828,7 +1860,6 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, else if (query->which == Z_Query_type_104 && query->u.type_104->which == Z_External_CQL) { - std::string torus_url = m_p->torus_searchable_url; std::string torus_query(query->u.type_104->u.cql); xmlDoc *doc = mp::get_searchable(package, torus_url, "", torus_query, @@ -1843,8 +1874,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, if (!doc) { *error = YAZ_BIB1_UNSPECIFIED_ERROR; - *addinfo = odr_strdup(odr, "IR-Explain---1 problem. " - "Could not obtain Torus records for Explain"); + *addinfo = odr_strdup(odr, "Torus server unavailable or " + "incorrectly configured"); } else { @@ -1878,7 +1909,7 @@ static bool wait_conn(COMSTACK cs, int secs) yaz_poll_add(pfd.input_mask, yaz_poll_except); if (cs->io_pending && CS_WANT_WRITE) yaz_poll_add(pfd.input_mask, yaz_poll_write); - else if (cs->io_pending & CS_WANT_READ) + if (cs->io_pending & CS_WANT_READ) yaz_poll_add(pfd.input_mask, yaz_poll_read); pfd.fd = cs_fileno(cs); @@ -1919,6 +1950,8 @@ bool yf::Zoom::Impl::check_proxy(const char *proxy) if (!wait_conn(conn, proxy_timeout)) break; } + if (ret == 0) + outcome = true; } } cs_close(conn); @@ -1943,8 +1976,8 @@ bool yf::Zoom::Frontend::retry(mp::Package &package, package.log("zoom", YLOG_WARN, "search failed: trying next proxy"); return true; } - error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR; - *addinfo = odr_strdup(odr, "proxy failure"); + error = YAZ_BIB1_PROXY_FAILURE; + *addinfo = odr_strdup(odr, b->m_proxy.c_str()); } else if (same_retries == 0 && proxy_retries == 0) { @@ -2065,8 +2098,7 @@ next_proxy: cql_parser_destroy(cp); return; } - char ccl_buf[1024]; - r = cql_to_ccl_buf(cn, ccl_buf, sizeof(ccl_buf)); + r = cql_to_ccl(cn, wrbuf_vp_puts, ccl_wrbuf); if (r) { error = YAZ_BIB1_MALFORMED_QUERY; @@ -2094,8 +2126,6 @@ next_proxy: mp::wrbuf sort_spec_wrbuf; yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf), sort_spec_wrbuf); - wrbuf_puts(ccl_wrbuf, ccl_buf); - yaz_tok_cfg_t tc = yaz_tok_cfg_create(); yaz_tok_parse_t tp = yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf)); @@ -2201,11 +2231,7 @@ next_proxy: } else { - cql_transform_t cqlt = cql_transform_create(); - - status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery); - - cql_transform_close(cqlt); + status = cql_transform_rpn2cql_wrbuf(b->cqlt, wrb, zquery); } if (status == 0) {