X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_zoom.cpp;h=bbd8302c05319ced402f616b3a0dd237ae6c1cdd;hb=1601cfdde92b0311701c1208f7b322087d2ac9cf;hp=d7dc442f6655cc9dfc163a025bb456a7ee8523d8;hpb=dba860afcd0aa86cddd862c6116c903fd796da29;p=metaproxy-moved-to-github.git diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index d7dc442..bbd8302 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -148,6 +148,7 @@ namespace metaproxy_1 { const char *element_set_name, bool &enable_pz2_retrieval, bool &enable_pz2_transform, + bool &enable_record_transform, bool &assume_marc8_charset); Z_Records *get_records(Package &package, @@ -206,7 +207,9 @@ namespace metaproxy_1 { std::string element_raw; std::string proxy; xsltStylesheetPtr explain_xsp; + xsltStylesheetPtr record_xsp; std::map s_map; + std::string zoom_timeout; }; } } @@ -429,11 +432,13 @@ void yf::Zoom::Impl::release_frontend(mp::Package &package) } yf::Zoom::Impl::Impl() : - apdu_log(false), element_transform("pz2") , element_raw("raw") + apdu_log(false), element_transform("pz2") , element_raw("raw"), + zoom_timeout("40") { bibset = ccl_qual_mk(); explain_xsp = 0; + record_xsp = 0; srand((unsigned int) time(0)); } @@ -545,8 +550,11 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr) "cclmap_", 7)) { std::string value = mp::xml::get_text(ptr); - ccl_qual_fitem(s->ccl_bibset, value.c_str(), - (const char *) ptr->name + 7); + if (value.length() > 0) + { + ccl_qual_fitem(s->ccl_bibset, value.c_str(), + (const char *) ptr->name + 7); + } } else if (!strncmp((const char *) ptr->name, "sortmap_", 8)) @@ -615,6 +623,7 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, const char *path) { std::string explain_xslt_fname; + std::string record_xslt_fname; content_tmp_file = "/tmp/cf.XXXXXX.p"; if (path && *path) @@ -646,6 +655,8 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, proxy = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "explain_xsl")) explain_xslt_fname = mp::xml::get_text(attr->children); + else if (!strcmp((const char *) attr->name, "record_xsl")) + record_xslt_fname = mp::xml::get_text(attr->children); else throw mp::filter::FilterException( "Bad attribute " + std::string((const char *) @@ -709,6 +720,19 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, attr->name)); } } + else if (!strcmp((const char *) ptr->name, "zoom")) + { + const struct _xmlAttr *attr; + for (attr = ptr->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "timeout")) + zoom_timeout = mp::xml::get_text(attr->children); + else + throw mp::filter::FilterException( + "Bad attribute " + std::string((const char *) + attr->name)); + } + } else { throw mp::filter::FilterException @@ -752,6 +776,41 @@ void yf::Zoom::Impl::configure(const xmlNode *ptr, bool test_only, } } + + if (record_xslt_fname.length()) + { + const char *path = 0; + + if (xsldir.length()) + path = xsldir.c_str(); + else + path = file_path.c_str(); + + char fullpath[1024]; + char *cp = yaz_filepath_resolve(record_xslt_fname.c_str(), + path, 0, fullpath); + if (!cp) + { + throw mp::filter::FilterException + ("Cannot read XSLT " + record_xslt_fname); + } + + xmlDoc *xsp_doc = xmlParseFile(cp); + if (!xsp_doc) + { + throw mp::filter::FilterException + ("Cannot parse XSLT " + record_xslt_fname); + } + + record_xsp = xsltParseStylesheetDoc(xsp_doc); + if (!record_xsp) + { + xmlFreeDoc(xsp_doc); + throw mp::filter::FilterException + ("Cannot parse XSLT " + record_xslt_fname); + + } + } } bool yf::Zoom::Frontend::create_content_session(mp::Package &package, @@ -812,7 +871,8 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( int *proxy_step) { std::list::const_iterator map_it; - if (m_backend && m_backend->m_frontend_database == database) + if (m_backend && !m_backend->enable_explain && + m_backend->m_frontend_database == database) return m_backend; std::string input_args; @@ -936,7 +996,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( sptr = it->second; else if (torus_url.length() > 0) { - std::string torus_query = "udb=" + torus_db; + std::string torus_query = "udb==" + torus_db; xmlDoc *doc = mp::get_searchable(package,torus_url, torus_db, torus_query, realm, m_p->proxy); @@ -1061,7 +1121,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases( if (sptr->query_encoding.length()) b->set_option("rpnCharset", sptr->query_encoding); - b->set_option("timeout", "40"); + b->set_option("timeout", m_p->zoom_timeout.c_str()); if (m_p->apdu_log) b->set_option("apdulog", "1"); @@ -1175,24 +1235,31 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b, 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; if (preferredRecordSyntax && - !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml) - && element_set_name) + !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) { - if (!strcmp(element_set_name, m_p->element_transform.c_str())) + if (element_set_name && + !strcmp(element_set_name, m_p->element_transform.c_str())) { enable_pz2_retrieval = true; enable_pz2_transform = true; } - else if (!strcmp(element_set_name, m_p->element_raw.c_str())) + else if (element_set_name && + !strcmp(element_set_name, m_p->element_raw.c_str())) + { + enable_pz2_retrieval = true; + } + else if (m_p->record_xsp) { enable_pz2_retrieval = true; + enable_pz2_transform = true; + enable_record_transform = true; } } @@ -1259,21 +1326,26 @@ Z_Records *yf::Zoom::Frontend::get_explain_records( npl->records = (Z_NamePlusRecord **) odr_malloc(odr, number_to_present * sizeof(*npl->records)); - for (i = start; i < start + number_to_present; i++) + for (i = 0; i < number_to_present; i++) { - const char *rec_buf = ""; - int rec_len = strlen(rec_buf); int num = 0; - xmlNode *res = xml_node_search(ptr, &num, start + i); + xmlNode *res = xml_node_search(ptr, &num, start + i + 1); if (!res) break; + xmlBufferPtr xml_buf = xmlBufferCreate(); + xmlNode *tmp_node = xmlCopyNode(res->children, 1); + xmlNodeDump(xml_buf, tmp_node->doc, tmp_node, 0, 0); Z_NamePlusRecord *npr = (Z_NamePlusRecord *) odr_malloc(odr, sizeof(*npr)); npr->databaseName = odr_strdup(odr, b->m_frontend_database.c_str()); npr->which = Z_NamePlusRecord_databaseRecord; npr->u.databaseRecord = - z_ext_record_xml(odr, rec_buf, rec_len); + z_ext_record_xml(odr, + (const char *) xml_buf->content, xml_buf->use); + npl->records[i] = npr; + xmlFreeNode(tmp_node); + xmlBufferFree(xml_buf); } records = (Z_Records*) odr_malloc(odr, sizeof(*records)); records->which = Z_Records_DBOSD; @@ -1301,11 +1373,13 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package, bool enable_pz2_retrieval = false; // whether target profile is used bool enable_pz2_transform = false; // whether XSLT is used as well bool assume_marc8_charset = false; + bool enable_record_transform = false; prepare_elements(b, preferredRecordSyntax, element_set_name, enable_pz2_retrieval, enable_pz2_transform, + enable_record_transform, assume_marc8_charset); package.log("zoom", YLOG_LOG, "pz2_retrieval: %s . pz2_transform: %s", @@ -1332,6 +1406,32 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package, } if (i > 0) { // only return records if no error and at least one record + + const char *xsl_parms[3]; + char cproxy_host[1024]; + + if (b->enable_cproxy && b->content_session_id.length()) + { + sprintf(cproxy_host, "%s.%s/", + b->content_session_id.c_str(), + m_p->content_proxy_server.c_str()); + + char *q_cproxy_host = (char *) + odr_malloc(odr, strlen(cproxy_host) + 3); + strcpy(q_cproxy_host, "\""); + strcat(q_cproxy_host, cproxy_host); + strcat(q_cproxy_host, "\""); + + xsl_parms[0] = "cproxyhost"; + xsl_parms[1] = q_cproxy_host; + xsl_parms[2] = 0; + } + else + { + xsl_parms[0] = 0; + *cproxy_host = '\0'; + } + char *odr_database = odr_strdup(odr, b->m_frontend_database.c_str()); Z_NamePlusRecordList *npl = (Z_NamePlusRecordList *) @@ -1406,13 +1506,45 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package, } else { - xmlDoc *rec_res = - xsltApplyStylesheet(b->xsp, rec_doc, 0); + // first stage XSLT - per target + xsltStylesheetPtr xsp = b->xsp; + xmlDoc *rec_res = xsltApplyStylesheet(xsp, rec_doc, + xsl_parms); + // insert generated-url + if (rec_res) + { + std::string res = + mp::xml::url_recipe_handle(rec_res, + b->sptr->urlRecipe); + if (res.length()) + { + xmlNode *ptr = xmlDocGetRootElement(rec_res); + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + xmlNode *c = + 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); + } + } + // second stage XSLT - common + if (rec_res && m_p->record_xsp && + enable_record_transform) + { + xmlDoc *tmp_doc = rec_res; + xsp = m_p->record_xsp; + rec_res = xsltApplyStylesheet(xsp, tmp_doc, + xsl_parms); + xmlFreeDoc(tmp_doc); + } + // get result out of it if (rec_res) { xsltSaveResultToString(&xmlrec_buf, &rec_len, - rec_res, b->xsp); + rec_res, xsp); rec_buf = (const char *) xmlrec_buf; package.log("zoom", YLOG_LOG, "xslt successful"); package.log_write(rec_buf, rec_len); @@ -1435,43 +1567,6 @@ Z_Records *yf::Zoom::Frontend::get_records(Package &package, } } - if (rec_buf && b->enable_cproxy) - { - xmlDoc *doc = xmlParseMemory(rec_buf, rec_len); - std::string res = - mp::xml::url_recipe_handle(doc, b->sptr->urlRecipe); - if (res.length() && b->content_session_id.length()) - { - size_t off = res.find_first_of("://"); - if (off != std::string::npos) - { - char tmp[1024]; - sprintf(tmp, "%s.%s/", - b->content_session_id.c_str(), - m_p->content_proxy_server.c_str()); - res.insert(off + 3, tmp); - } - } - if (res.length()) - { - xmlNode *ptr = xmlDocGetRootElement(doc); - while (ptr && ptr->type != XML_ELEMENT_NODE) - ptr = ptr->next; - xmlNode *c = - 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); - - if (xmlrec_buf) - xmlFree(xmlrec_buf); - - xmlDocDumpMemory(doc, &xmlrec_buf, &rec_len); - rec_buf = (const char *) xmlrec_buf; - } - xmlFreeDoc(doc); - } if (!npr) { if (!rec_buf) @@ -1585,7 +1680,15 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, Z_SearchRequest *sr = apdu_req->u.searchRequest; Z_Query *query = sr->query; - if (query->which == Z_Query_type_104 && + if (!m_p->explain_xsp) + { + *error = YAZ_BIB1_UNSPECIFIED_ERROR; + *addinfo = + odr_strdup(odr, "IR-Explain---1 unsupported. " + "Torus explain_xsl not defined"); + return m_backend; + } + 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; @@ -1603,17 +1706,11 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, if (!doc) { *error = YAZ_BIB1_UNSPECIFIED_ERROR; - *addinfo = odr_strdup(odr, "Torus XML/Explain problem"); + *addinfo = odr_strdup(odr, "IR-Explain---1 problem. " + "Could not obtain Torus records for Explain"); } else { -#if 1 - xmlChar *buf_out = 0; - int len_out; - xmlDocDumpMemory(doc, &buf_out, &len_out); - fwrite(buf_out, 1, len_out, yaz_log_file()); - xmlFree(buf_out); -#endif xmlNode *ptr = xmlDocGetRootElement(doc); int hits = 0; @@ -1632,7 +1729,7 @@ yf::Zoom::BackendPtr yf::Zoom::Frontend::explain_search(mp::Package &package, else { *error = YAZ_BIB1_QUERY_TYPE_UNSUPP; - *addinfo = odr_strdup(odr, "RPN/CCL, IR-Explain---1"); + *addinfo = odr_strdup(odr, "IR-Explain---1 only supports CQL"); return m_backend; } } @@ -1682,10 +1779,12 @@ next_proxy: 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); Odr_int hits = 0; @@ -1841,12 +1940,16 @@ next_proxy: switch (cerror) { case CCL_ERR_UNKNOWN_QUAL: - 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: - error = YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; +#ifdef CCL_ERR_TRUNC_NOT_EMBED + case CCL_ERR_TRUNC_NOT_EMBED: +#endif +#ifdef CCL_ERR_TRUNC_NOT_SINGLE + case CCL_ERR_TRUNC_NOT_SINGLE: +#endif + error = YAZ_BIB1_UNSUPP_SEARCH; break; } log_diagnostic(package, error, addinfo);