X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=60a8babafb5d24271c5f60ecaf8c56054ca46703;hb=8c9c3b0f7bf85453c42e418f4a740d570f2189c1;hp=ff73e19ecfcd345d23cf75ba890863292d56124f;hpb=d09aef2b0f7bd651a1132750144cb9d1460dca91;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index ff73e19..60a8bab 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -21,10 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include "filter_zoom.hpp" -#include -#include -#include -#include #include #include #include @@ -35,6 +31,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include + +#include +#include +#include #include #include #include @@ -46,6 +46,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include +#include +#include namespace mp = metaproxy_1; namespace yf = mp::filter; @@ -57,11 +60,12 @@ namespace metaproxy_1 { std::string authentication; std::string cfAuth; std::string cfProxy; - std::string cfSubDb; + std::string cfSubDB; std::string udb; std::string target; std::string query_encoding; std::string sru; + std::string sru_version; std::string request_syntax; std::string element_set; std::string record_encoding; @@ -69,9 +73,11 @@ namespace metaproxy_1 { std::string transform_xsl_content; std::string urlRecipe; std::string contentConnector; + std::string sortStrategy; bool use_turbomarc; bool piggyback; CCL_bibset ccl_bibset; + std::map sortmap; Searchable(CCL_bibset base); ~Searchable(); }; @@ -79,6 +85,7 @@ namespace metaproxy_1 { friend class Impl; friend class Frontend; std::string zurl; + WRBUF m_apdu_wrbuf; ZOOM_connection m_connection; ZOOM_resultset m_resultset; std::string m_frontend_database; @@ -90,10 +97,8 @@ namespace metaproxy_1 { ~Backend(); void connect(std::string zurl, int *error, char **addinfo, ODR odr); - void search_pqf(const char *pqf, Odr_int *hits, - int *error, char **addinfo, ODR odr); - void search_cql(const char *cql, Odr_int *hits, - int *error, char **addinfo, ODR odr); + void search(ZOOM_query q, Odr_int *hits, + int *error, char **addinfo, 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); @@ -111,12 +116,20 @@ namespace metaproxy_1 { void handle_package(mp::Package &package); void handle_search(mp::Package &package); void handle_present(mp::Package &package); - BackendPtr get_backend_from_databases(std::string &database, + BackendPtr get_backend_from_databases(mp::Package &package, + std::string &database, int *error, char **addinfo, ODR odr); - + bool create_content_session(mp::Package &package, + BackendPtr b, + int *error, + char **addinfo, + ODR odr, + std::string authentication, + std::string proxy); + void prepare_elements(BackendPtr b, Odr_oid *preferredRecordSyntax, const char *element_set_name, @@ -124,7 +137,8 @@ namespace metaproxy_1 { bool &enable_pz2_transform, bool &assume_marc8_charset); - Z_Records *get_records(Odr_int start, + Z_Records *get_records(Package &package, + Odr_int start, Odr_int number_to_present, int *error, char **addinfo, @@ -132,6 +146,9 @@ namespace metaproxy_1 { ODR odr, BackendPtr b, Odr_oid *preferredRecordSyntax, const char *element_set_name); + + void log_diagnostic(mp::Package &package, + int error, const char *addinfo); public: Frontend(Impl *impl); ~Frontend(); @@ -153,7 +170,9 @@ namespace metaproxy_1 { std::map m_clients; boost::mutex m_mutex; boost::condition m_cond_session_ready; - std::string torus_url; + std::string torus_searchable_url; + std::string torus_content_url; + std::string default_realm; std::map fieldmap; std::string xsldir; std::string file_path; @@ -195,7 +214,9 @@ void yf::Zoom::process(mp::Package &package) const yf::Zoom::Backend::Backend(SearchablePtr ptr) : sptr(ptr) { + m_apdu_wrbuf = wrbuf_alloc(); m_connection = ZOOM_connection_create(0); + ZOOM_connection_save_apdu_wrbuf(m_connection, m_apdu_wrbuf); m_resultset = 0; xsp = 0; } @@ -215,38 +236,30 @@ void yf::Zoom::Backend::get_zoom_error(int *error, char **addinfo, const char *msg = 0; const char *zoom_addinfo = 0; const char *dset = 0; - *error = ZOOM_connection_error_x(m_connection, &msg, &zoom_addinfo, &dset); - if (*error) + int error0 = ZOOM_connection_error_x(m_connection, &msg, + &zoom_addinfo, &dset); + if (error0) { - if (*error >= ZOOM_ERROR_CONNECT) - { - // turn ZOOM diagnostic into a Bib-1 2: with addinfo=zoom err msg - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) odr_malloc( - odr, 20 + strlen(msg) + - (zoom_addinfo ? strlen(zoom_addinfo) : 0)); - strcpy(*addinfo, msg); - if (zoom_addinfo) - { - strcat(*addinfo, ": "); - strcat(*addinfo, zoom_addinfo); - strcat(*addinfo, " "); - } - } + if (!dset) + dset = "Unknown"; + + if (!strcmp(dset, "info:srw/diagnostic/1")) + *error = yaz_diag_srw_to_bib1(error0); + else if (!strcmp(dset, "Bib-1")) + *error = error0; else - { - if (dset && !strcmp(dset, "info:srw/diagnostic/1")) - *error = yaz_diag_srw_to_bib1(*error); - *addinfo = (char *) odr_malloc( - odr, 20 + (zoom_addinfo ? strlen(zoom_addinfo) : 0)); - **addinfo = '\0'; - if (zoom_addinfo && *zoom_addinfo) - { - strcpy(*addinfo, zoom_addinfo); - strcat(*addinfo, " "); - } - strcat(*addinfo, "(backend)"); + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + + *addinfo = (char *) odr_malloc( + odr, 30 + strlen(dset) + strlen(msg) + + (zoom_addinfo ? strlen(zoom_addinfo) : 0)); + **addinfo = '\0'; + if (zoom_addinfo && *zoom_addinfo) + { + strcpy(*addinfo, zoom_addinfo); + strcat(*addinfo, " "); } + sprintf(*addinfo + strlen(*addinfo), "(%s %d %s)", dset, error0, msg); } } @@ -258,26 +271,10 @@ void yf::Zoom::Backend::connect(std::string zurl, get_zoom_error(error, addinfo, odr); } -void yf::Zoom::Backend::search_pqf(const char *pqf, Odr_int *hits, - int *error, char **addinfo, ODR odr) -{ - m_resultset = ZOOM_connection_search_pqf(m_connection, pqf); - get_zoom_error(error, addinfo, odr); - if (*error == 0) - *hits = ZOOM_resultset_size(m_resultset); - else - *hits = 0; -} - -void yf::Zoom::Backend::search_cql(const char *cql, Odr_int *hits, - int *error, char **addinfo, ODR odr) +void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits, + int *error, char **addinfo, ODR odr) { - ZOOM_query q = ZOOM_query_create(); - - ZOOM_query_cql(q, cql); - m_resultset = ZOOM_connection_search(m_connection, q); - ZOOM_query_destroy(q); get_zoom_error(error, addinfo, odr); if (*error == 0) *hits = ZOOM_resultset_size(m_resultset); @@ -314,6 +311,8 @@ yf::Zoom::Searchable::Searchable(CCL_bibset base) { piggyback = true; use_turbomarc = true; + sortStrategy = "embed"; + urlRecipe = "${md-electronic-url}"; ccl_bibset = ccl_qual_dup(base); } @@ -415,9 +414,9 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) s->cfProxy = mp::xml::get_text(ptr); } else if (!strcmp((const char *) ptr->name, - "cfSubDb")) + "cfSubDB")) { - s->cfSubDb = mp::xml::get_text(ptr); + s->cfSubDB = mp::xml::get_text(ptr); } else if (!strcmp((const char *) ptr->name, "contentConnector")) @@ -436,6 +435,11 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) { s->sru = mp::xml::get_text(ptr); } + else if (!strcmp((const char *) ptr->name, "SRUVersion") || + !strcmp((const char *) ptr->name, "sruVersion")) + { + s->sru_version = mp::xml::get_text(ptr); + } else if (!strcmp((const char *) ptr->name, "queryEncoding")) { @@ -488,6 +492,17 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) ccl_qual_fitem(s->ccl_bibset, value.c_str(), (const char *) ptr->name + 7); } + else if (!strncmp((const char *) ptr->name, + "sortmap_", 8)) + { + std::string value = mp::xml::get_text(ptr); + s->sortmap[(const char *) ptr->name + 8] = value; + } + else if (!strcmp((const char *) ptr->name, + "sortStrategy")) + { + s->sortStrategy = mp::xml::get_text(ptr); + } } return s; } @@ -558,7 +573,11 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, for (attr = ptr->properties; attr; attr = attr->next) { if (!strcmp((const char *) attr->name, "url")) - torus_url = mp::xml::get_text(attr->children); + torus_searchable_url = mp::xml::get_text(attr->children); + else if (!strcmp((const char *) attr->name, "content_url")) + torus_content_url = 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, "xsldir")) xsldir = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "element_transform")) @@ -572,6 +591,10 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, "Bad attribute " + std::string((const char *) attr->name)); } + // If content_url is not given, use value of searchable, to + // ensure backwards compatibility + if (!torus_content_url.length()) + torus_content_url = torus_searchable_url; configure_local_records(ptr->children, test_only); } else if (!strcmp((const char *) ptr->name, "cclmap")) @@ -636,33 +659,163 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, } } +bool yf::Zoom::Frontend::create_content_session(mp::Package &package, + BackendPtr b, + int *error, char **addinfo, + ODR odr, + std::string authentication, + std::string proxy) +{ + if (b->sptr->contentConnector.length()) + { + char *fname = (char *) xmalloc(m_p->content_tmp_file.length() + 8); + strcpy(fname, m_p->content_tmp_file.c_str()); + char *xx = strstr(fname, "XXXXXX"); + if (!xx) + { + xx = fname + strlen(fname); + strcat(fname, "XXXXXX"); + } + char tmp_char = xx[6]; + sprintf(xx, "%06d", ((unsigned) rand()) % 1000000); + xx[6] = tmp_char; + + FILE *file = fopen(fname, "w"); + if (!file) + { + package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname); + *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname)); + sprintf(*addinfo, "Could not create %s", fname); + xfree(fname); + return false; + } + b->content_session_id.assign(xx, 6); + WRBUF w = wrbuf_alloc(); + wrbuf_puts(w, "#content_proxy\n"); + wrbuf_printf(w, "connector: %s\n", b->sptr->contentConnector.c_str()); + if (authentication.length()) + wrbuf_printf(w, "auth: %s\n", authentication.c_str()); + if (proxy.length()) + wrbuf_printf(w, "proxy: %s\n", proxy.c_str()); + + fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file); + fclose(file); + package.log("zoom", YLOG_LOG, "content file: %s", fname); + xfree(fname); + } + return true; +} + yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( + mp::Package &package, std::string &database, int *error, char **addinfo, ODR odr) { std::list::const_iterator map_it; if (m_backend && m_backend->m_frontend_database == database) return m_backend; - std::string db_args; + 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); - db_args = database.substr(db_arg_pos + 1); + input_args = database.substr(db_arg_pos + 1); } else torus_db = database; - + + std::string authentication; + std::string content_authentication; + std::string proxy; + std::string content_proxy; + std::string 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; + 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, "proxy")) + proxy = value; + 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")) + realm = 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, "Bad database argument: %s", name); + *addinfo = msg; + return notfound; + } + } + 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); + } 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 + else if (torus_url.length() > 0) { - xmlDoc *doc = mp::get_searchable(m_p->torus_url, torus_db, m_p->proxy); + xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db, + realm, m_p->proxy); if (!doc) { *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST; @@ -787,95 +940,54 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (m_p->apdu_log) b->set_option("apdulog", "1"); - if (sptr->piggyback) + 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; - std::string proxy = sptr->cfProxy; - - const char *param_user = 0; - const char *param_password = 0; - const char *param_proxy = 0; - if (db_args.length()) - { - char **names; - char **values; - int i; - int no_parms = yaz_uri_to_array(db_args.c_str(), - odr, &names, &values); - for (i = 0; i < no_parms; i++) - { - const char *name = names[i]; - const char *value = values[i]; - if (!strcmp(name, "user")) - param_user = value; - else if (!strcmp(name, "password")) - param_password = value; - else if (!strcmp(name, "proxy")) - param_proxy = value; - else if (!strcmp(name, "cproxysession")) - ; - else - { - BackendPtr notfound; - char *msg = (char*) odr_malloc(odr, strlen(name) + 30); - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - sprintf(msg, "Bad database argument: %s", name); - *addinfo = msg; - return notfound; - } - } - if (param_user) - { - authentication = std::string(param_user); - if (param_password) - authentication += "/" + std::string(param_password); - } - if (param_proxy) - proxy = param_proxy; - } + if (authentication.length() == 0) + authentication = sptr->authentication; + if (proxy.length() == 0) + proxy = sptr->cfProxy; + if (sptr->cfAuth.length()) { // A CF target b->set_option("user", sptr->cfAuth); - if (!param_user && !param_password && authentication.length()) + if (authentication.length()) { - if (db_args.length()) - db_args += "&"; - // no database (auth) args specified already.. and the - // Torus authentication has it.. Generate the args that CF - // understands.. size_t found = authentication.find('/'); if (found != std::string::npos) { - db_args += "user=" + - mp::util::uri_encode(authentication.substr(0, found)) - + "&password=" + - mp::util::uri_encode(authentication.substr(found+1)); + 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 - db_args += "user=" + mp::util::uri_encode(authentication); + { + out_names[no_out_args] = "user"; + out_values[no_out_args++] = + odr_strdup(odr, authentication.c_str()); + } } - if (!param_proxy && proxy.length()) + if (proxy.length()) { - if (db_args.length()) - db_args += "&"; - db_args += "proxy=" + mp::util::uri_encode(proxy); + out_names[no_out_args] = "proxy"; + out_values[no_out_args++] = odr_strdup(odr, proxy.c_str()); } - if (sptr->cfSubDb.length()) + if (sptr->cfSubDB.length()) { - if (db_args.length()) - db_args += "&"; - db_args += "subdatabase=" + mp::util::uri_encode(sptr->cfSubDb); + out_names[no_out_args] = "subdatabase"; + out_values[no_out_args++] = odr_strdup(odr, sptr->cfSubDB.c_str()); } } else { - db_args.clear(); // no arguments to be passed (non-CF) - size_t found = authentication.find('/'); if (sptr->sru.length() && found != std::string::npos) @@ -889,66 +1001,37 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (proxy.length()) b->set_option("proxy", proxy); } - if (b->sptr->contentConnector.length()) - { - char *fname = (char *) xmalloc(m_p->content_tmp_file.length() + 8); - strcpy(fname, m_p->content_tmp_file.c_str()); - char *xx = strstr(fname, "XXXXXX"); - if (!xx) - { - xx = fname + strlen(fname); - strcat(fname, "XXXXXX"); - } - char tmp_char = xx[6]; - sprintf(xx, "%06d", ((unsigned) rand()) % 1000000); - xx[6] = tmp_char; - - FILE *file = fopen(fname, "w"); - if (!file) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "create %s", fname); - *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; - *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname)); - sprintf(*addinfo, "Could not create %s", fname); - xfree(fname); - BackendPtr backend_null; - return backend_null; - } - b->content_session_id.assign(xx, 6); - WRBUF w = wrbuf_alloc(); - wrbuf_puts(w, "#content_proxy\n"); - wrbuf_printf(w, "connector: %s\n", b->sptr->contentConnector.c_str()); - if (authentication.length()) - wrbuf_printf(w, "authentication: %s\n", authentication.c_str()); - if (proxy.length()) - wrbuf_printf(w, "proxy: %s\n", proxy.c_str()); - if (sptr->cfProxy.length()) - wrbuf_printf(w, "cfproxy: %s\n", sptr->cfProxy.c_str()); - - fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file); - fclose(file); - yaz_log(YLOG_LOG, "file %s created\n", fname); - xfree(fname); - } - std::string url; if (sptr->sru.length()) { url = "http://" + sptr->target; b->set_option("sru", sptr->sru); + + if (sptr->sru_version.length()) + b->set_option("sru_version", sptr->sru_version); } else { url = sptr->target; } - if (db_args.length()) - url += "," + db_args; - yaz_log(YLOG_LOG, "url=%s", url.c_str()); + 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) - { + create_content_session(package, b, error, addinfo, odr, + content_authentication.length() ? + content_authentication : authentication, + content_proxy.length() ? content_proxy : proxy); + if (*error == 0) m_backend = b; - } return b; } @@ -1008,10 +1091,12 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b, } b->set_option("elementSetName", element_set_name); - + if (b->sptr->sru.length() && element_set_name) + b->set_option("schema", element_set_name); } -Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, +Z_Records *yf::Zoom::Frontend::get_records(Package &package, + Odr_int start, Odr_int number_to_present, int *error, char **addinfo, @@ -1033,6 +1118,10 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, enable_pz2_transform, assume_marc8_charset); + package.log("zoom", YLOG_LOG, "pz2_retrieval: %s . pz2_transform: %s", + enable_pz2_retrieval ? "yes" : "no", + enable_pz2_transform ? "yes" : "no"); + if (start < 0 || number_to_present <=0) return records; @@ -1065,11 +1154,15 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, { Z_NamePlusRecord *npr = 0; const char *addinfo; + + package.log("zoom", YLOG_LOG, "Inspecting record at position %d", + start + i); int sur_error = ZOOM_record_error(recs[i], 0 /* msg */, &addinfo, 0 /* diagset */); if (sur_error) { + log_diagnostic(package, sur_error, addinfo); npr = zget_surrogateDiagRec(odr, odr_database, sur_error, addinfo); } @@ -1089,7 +1182,9 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, strcat(rec_type_str, "; charset="); strcat(rec_type_str, record_encoding); } - + + package.log("zoom", YLOG_LOG, "Getting record of type %s", + rec_type_str); int rec_len; xmlChar *xmlrec_buf = 0; const char *rec_buf = ZOOM_record_get(recs[i], rec_type_str, @@ -1098,11 +1193,16 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, { std::string addinfo("ZOOM_record_get failed for type "); + int error = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; addinfo += rec_type_str; - npr = zget_surrogateDiagRec( - odr, odr_database, - YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, - addinfo.c_str()); + log_diagnostic(package, error, addinfo.c_str()); + npr = zget_surrogateDiagRec(odr, odr_database, + error, addinfo.c_str()); + } + else + { + package.log_write(rec_buf, rec_len); + package.log_write("\r\n", 2); } if (rec_buf && b->xsp && enable_pz2_transform) @@ -1110,10 +1210,11 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, xmlDoc *rec_doc = xmlParseMemory(rec_buf, rec_len); if (!rec_doc) { + const char *addinfo = "xml parse failed for record"; + int error = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + log_diagnostic(package, error, addinfo); npr = zget_surrogateDiagRec( - odr, odr_database, - YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, - "xml parse failed for record"); + odr, odr_database, error, addinfo); } else { @@ -1125,19 +1226,22 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, xsltSaveResultToString(&xmlrec_buf, &rec_len, rec_res, b->xsp); rec_buf = (const char *) xmlrec_buf; + package.log("zoom", YLOG_LOG, "xslt successful"); + package.log_write(rec_buf, rec_len); xmlFreeDoc(rec_res); } if (!rec_buf) { std::string addinfo; + int error = + YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; addinfo = "xslt apply failed for " + b->sptr->transform_xsl_fname; + log_diagnostic(package, error, addinfo.c_str()); npr = zget_surrogateDiagRec( - odr, odr_database, - YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, - addinfo.c_str()); + odr, odr_database, error, addinfo.c_str()); } xmlFreeDoc(rec_doc); } @@ -1166,7 +1270,9 @@ Z_Records *yf::Zoom::Frontend::get_records(Odr_int start, while (ptr && ptr->type != XML_ELEMENT_NODE) ptr = ptr->next; xmlNode *c = - xmlNewChild(ptr, 0, BAD_CAST "generated-url", 0); + xmlNewChild(ptr, 0, BAD_CAST "metadata", 0); + xmlNewProp(c, BAD_CAST "type", BAD_CAST + "generated-url"); xmlNode * t = xmlNewText(BAD_CAST res.c_str()); xmlAddChild(c, t); @@ -1259,109 +1365,17 @@ struct cql_node *yf::Zoom::Impl::convert_cql_fields(struct cql_node *cn, return r; } -static void sort_pqf_type_7(WRBUF pqf_wrbuf, const char *sru_sortkeys) -{ - /* sortkey layour: path,schema,ascending,caseSensitive,missingValue */ - /* see cql_sortby_to_sortkeys of YAZ. */ - char **sortspec; - int num_sortspec = 0; - int i; - NMEM nmem = nmem_create(); - - if (sru_sortkeys) - nmem_strsplit_blank(nmem, sru_sortkeys, &sortspec, &num_sortspec); - if (num_sortspec > 0) - { - WRBUF w = wrbuf_alloc(); - for (i = 0; i < num_sortspec; i++) - { - char **arg; - int num_arg; - int ascending = 1; - nmem_strsplitx(nmem, ",", sortspec[i], &arg, &num_arg, 0); - - if (num_arg > 2 && arg[2][0]) - ascending = atoi(arg[2]); - - wrbuf_puts(w, "@or @attr 1="); - yaz_encode_pqf_term(w, arg[0], strlen(arg[0])); - wrbuf_printf(w, "@attr 7=%d %d ", ascending ? 1 : 2, i); - } - if (wrbuf_len(w)) - { - wrbuf_puts(w, wrbuf_cstr(pqf_wrbuf)); - wrbuf_rewind(pqf_wrbuf); - wrbuf_puts(pqf_wrbuf, wrbuf_cstr(w)); - } - wrbuf_destroy(w); - } - nmem_destroy(nmem); -} - -static void sort_via_cql(WRBUF cql_sortby, const char *sru_sortkeys) +void yf::Zoom::Frontend::log_diagnostic(mp::Package &package, + int error, const char *addinfo) { - /* sortkey layour: path,schema,ascending,caseSensitive,missingValue */ - /* see cql_sortby_to_sortkeys of YAZ. */ - char **sortspec; - int num_sortspec = 0; - int i; - NMEM nmem = nmem_create(); - - if (sru_sortkeys) - nmem_strsplit_blank(nmem, sru_sortkeys, &sortspec, &num_sortspec); - if (num_sortspec > 0) - { - WRBUF w = wrbuf_alloc(); - for (i = 0; i < num_sortspec; i++) - { - char **arg; - int num_arg; - int ascending = 1; - int case_sensitive = 0; - const char *missing = 0; - nmem_strsplitx(nmem, ",", sortspec[i], &arg, &num_arg, 0); - - if (num_arg > 2 && arg[2][0]) - ascending = atoi(arg[2]); - if (num_arg > 3 && arg[3][0]) - case_sensitive = atoi(arg[3]); - if (num_arg > 4 && arg[4][0]) - missing = arg[4]; - if (i > 0) - wrbuf_puts(w, " "); - else - wrbuf_puts(w, " sortby "); - wrbuf_puts(w, arg[0]); /* field */ - wrbuf_puts(w, "/"); - wrbuf_puts(w, ascending ? "ascending" : "descending"); - if (case_sensitive) - wrbuf_puts(w, "/respectCase"); - if (missing) - { - if (!strcmp(missing, "omit")) - wrbuf_puts(w, "/missingOmit"); - else if (!strcmp(missing, "abort")) - wrbuf_puts(w, "/missingFail"); - else if (!strcmp(missing, "lowValue")) - wrbuf_puts(w, "/missingLow"); - else if (!strcmp(missing, "highValue")) - wrbuf_puts(w, "/missingHigh"); - } - } - if (wrbuf_len(w)) - wrbuf_puts(cql_sortby, wrbuf_cstr(w)); - wrbuf_destroy(w); - } - nmem_destroy(nmem); -} - -#if YAZ_VERSIONL < 0x40206 -static void wrbuf_vp_puts(const char *buf, void *client_data) -{ - WRBUF b = (WRBUF) client_data; - wrbuf_puts(b, buf); + const char *err_msg = yaz_diag_bib1_str(error); + if (addinfo) + package.log("zoom", YLOG_WARN, "Diagnostic %d %s: %s", + error, err_msg, addinfo); + else + package.log("zoom", YLOG_WARN, "Diagnostic %d %s:", + error, err_msg); } -#endif void yf::Zoom::Frontend::handle_search(mp::Package &package) { @@ -1372,8 +1386,9 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) Z_SearchRequest *sr = apdu_req->u.searchRequest; if (sr->num_databaseNames != 1) { - apdu_res = odr.create_searchResponse( - apdu_req, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0); + int error = YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED; + log_diagnostic(package, error, 0); + apdu_res = odr.create_searchResponse(apdu_req, error, 0); package.response() = apdu_res; return; } @@ -1381,11 +1396,12 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) int error = 0; char *addinfo = 0; std::string db(sr->databaseNames[0]); - BackendPtr b = get_backend_from_databases(db, &error, &addinfo, odr); + BackendPtr b = get_backend_from_databases(package, db, &error, + &addinfo, odr); if (error) { - apdu_res = - odr.create_searchResponse(apdu_req, error, addinfo); + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } @@ -1404,7 +1420,7 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) Z_Query *query = sr->query; WRBUF ccl_wrbuf = 0; WRBUF pqf_wrbuf = 0; - std::string sru_sortkeys; + std::string sortkeys; if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101) { @@ -1426,13 +1442,15 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) 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, - YAZ_BIB1_MALFORMED_QUERY, - "CQL syntax error"); + odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } @@ -1441,14 +1459,13 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) 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; - - apdu_res = - odr.create_searchResponse(apdu_req, - YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, - addinfo); + + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } @@ -1463,25 +1480,63 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) WRBUF sru_sortkeys_wrbuf = wrbuf_alloc(); cql_sortby_to_sortkeys(cn, wrbuf_vp_puts, sru_sortkeys_wrbuf); - - sru_sortkeys.assign(wrbuf_cstr(sru_sortkeys_wrbuf)); + WRBUF sort_spec_wrbuf = wrbuf_alloc(); + yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf), + sort_spec_wrbuf); wrbuf_destroy(sru_sortkeys_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); + wrbuf_destroy(sort_spec_wrbuf); } cql_parser_destroy(cp); if (r) { - apdu_res = - odr.create_searchResponse(apdu_req, - YAZ_BIB1_MALFORMED_QUERY, - "CQL to CCL conversion error"); + 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; return; } } else { - apdu_res = - odr.create_searchResponse(apdu_req, YAZ_BIB1_QUERY_TYPE_UNSUPP, 0); + 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; } @@ -1492,37 +1547,42 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) assert(pqf_wrbuf == 0); int cerror, cpos; struct ccl_rpn_node *cn; - yaz_log(YLOG_LOG, "CCL: %s", wrbuf_cstr(ccl_wrbuf)); + 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); wrbuf_destroy(ccl_wrbuf); if (!cn) { char *addinfo = odr_strdup(odr, ccl_err_msg(cerror)); - int z3950_diag = YAZ_BIB1_MALFORMED_QUERY; + error = YAZ_BIB1_MALFORMED_QUERY; switch (cerror) { case CCL_ERR_UNKNOWN_QUAL: - z3950_diag = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; + error = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; break; case CCL_ERR_TRUNC_NOT_LEFT: case CCL_ERR_TRUNC_NOT_RIGHT: case CCL_ERR_TRUNC_NOT_BOTH: - z3950_diag = YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; + error = YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; break; } - apdu_res = - odr.create_searchResponse(apdu_req, z3950_diag, addinfo); + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } pqf_wrbuf = wrbuf_alloc(); ccl_pquery(pqf_wrbuf, cn); + package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf)); ccl_rpn_delete(cn); } assert(pqf_wrbuf); + + 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; @@ -1545,33 +1605,33 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery); cql_transform_close(cqlt); - - if (status == 0) - sort_via_cql(wrb, sru_sortkeys.c_str()); } if (status == 0) { - yaz_log(YLOG_LOG, "search CQL: %s", wrbuf_cstr(wrb)); - b->search_cql(wrbuf_cstr(wrb), &hits, &error, &addinfo, odr); + 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); wrbuf_destroy(wrb); wrbuf_destroy(pqf_wrbuf); if (status) { - apdu_res = - odr.create_searchResponse(apdu_req, YAZ_BIB1_MALFORMED_QUERY, - "can not convert from RPN to CQL/SOLR"); + error = YAZ_BIB1_MALFORMED_QUERY; + const char *addinfo = "can not convert from RPN to CQL/SOLR"; + log_diagnostic(package, error, addinfo); + apdu_res = odr.create_searchResponse(apdu_req, error, addinfo); package.response() = apdu_res; return; } } else { - sort_pqf_type_7(pqf_wrbuf, sru_sortkeys.c_str()); - - yaz_log(YLOG_LOG, "search PQF: %s", wrbuf_cstr(pqf_wrbuf)); - b->search_pqf(wrbuf_cstr(pqf_wrbuf), &hits, &error, &addinfo, odr); + 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); wrbuf_destroy(pqf_wrbuf); } @@ -1582,9 +1642,12 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package) 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) { @@ -1624,7 +1687,7 @@ void yf::Zoom::Frontend::handle_present(mp::Package &package) Odr_int number_of_records_returned = 0; int error = 0; char *addinfo = 0; - Z_Records *records = get_records( + Z_Records *records = get_records(package, *pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested, &error, &addinfo, &number_of_records_returned, odr, m_backend, pr->preferredRecordSyntax, element_set_name); @@ -1647,6 +1710,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); if (apdu_req->which == Z_APDU_initRequest) { mp::odr odr; @@ -1672,6 +1738,11 @@ void yf::Zoom::Frontend::handle_package(mp::Package &package) "zoom filter cannot handle this APDU"); package.session().close(); } + if (m_backend) + { + WRBUF w = m_backend->m_apdu_wrbuf; + package.log_write(wrbuf_buf(w), wrbuf_len(w)); + } } else {