X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=blobdiff_plain;f=src%2Fmetaproxy_filter_xquery.cpp;h=4864ce419d979b8edd48cb5f05ddbe972c5cf538;hp=c3d5d9186c1ad9a793632ac4839930ac275f3968;hb=1cea5f5d2d4290b91b272a179a5b747f34919131;hpb=6fe295deeaa7b097741702768586e833a88e0732 diff --git a/src/metaproxy_filter_xquery.cpp b/src/metaproxy_filter_xquery.cpp index c3d5d91..4864ce4 100644 --- a/src/metaproxy_filter_xquery.cpp +++ b/src/metaproxy_filter_xquery.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #include #include @@ -58,6 +59,8 @@ namespace metaproxy_1 { std::string zorba_filename; std::string zorba_script; std::string zorba_record_variable; + std::string elementset_input; + std::string elementset_output; Zorba *lZorba; XQuery_t lQuery; }; @@ -102,10 +105,16 @@ bool yf::XQuery::convert_one_record(const char *input_buf, lItem = lZorba->getItemFactory()->createString(rec_content); lDynamicContext->setVariable(zorba_record_variable, lItem); - std::stringstream ss; - tQuery->execute(ss); - result = ss.str(); - return true; + try { + std::stringstream ss; + tQuery->execute(ss); + result = ss.str(); + return true; + } catch ( ZorbaException &e) { + result = e.what(); + yaz_log(YLOG_WARN, "XQuery execute: %s", result.c_str()); + return false; + } } void yf::XQuery::process(Package &package) const @@ -175,10 +184,10 @@ void yf::XQuery::process(Package &package) const const char *backend_schema = 0; const Odr_oid *backend_syntax = 0; - if (input_schema && !strcmp(input_schema, "bibframe") && + if (input_schema && !strcmp(input_schema, elementset_input.c_str()) && (!input_syntax || !oid_oidcmp(input_syntax, yaz_oid_recsyn_xml))) { - backend_schema = "marcxml"; + backend_schema = elementset_output.c_str(); backend_syntax = yaz_oid_recsyn_xml; } else @@ -272,11 +281,11 @@ void yf::XQuery::process(Package &package) const int i; for (i = 0; i < records->num_records; i++) { - Z_NamePlusRecord *npr = records->records[i]; - if (npr->which == Z_NamePlusRecord_databaseRecord) + Z_NamePlusRecord **npr = &records->records[i]; + if ((*npr)->which == Z_NamePlusRecord_databaseRecord) { const char *details = 0; - Z_External *r = npr->u.databaseRecord; + Z_External *r = (*npr)->u.databaseRecord; int ret_trans = -1; if (r->which == Z_External_octet && !oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml)) @@ -286,11 +295,18 @@ void yf::XQuery::process(Package &package) const r->u.octet_aligned->buf, r->u.octet_aligned->len, result)) { - npr->u.databaseRecord = + (*npr)->u.databaseRecord = z_ext_record_oid(odr_en, yaz_oid_recsyn_xml, result.c_str(), result.length()); } + else + { + *npr = zget_surrogateDiagRec( + odr_en, (*npr)->databaseName, + YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, + result.c_str()); + } } } } @@ -305,7 +321,20 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only, { if (ptr->type != XML_ELEMENT_NODE) continue; - if (!strcmp((const char *) ptr->name, "setVariable")) + if (!strcmp((const char *) ptr->name, "elementset")) + { + struct _xmlAttr *attr; + for (attr = ptr->properties; attr; attr = attr->next) + if (!strcmp((const char *) attr->name, "name")) + elementset_input = mp::xml::get_text(attr->children); + else if (!strcmp((const char *) attr->name, "backend")) + elementset_output = mp::xml::get_text(attr->children); + else + throw mp::filter::FilterException( + "Bad attribute " + std::string((const char *) + attr->name)); + } + else if (!strcmp((const char *) ptr->name, "variable")) { std::string name; std::string value; @@ -324,29 +353,29 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only, } else if (!strcmp((const char *) ptr->name, "script")) { - std::string value; + std::string name; struct _xmlAttr *attr; for (attr = ptr->properties; attr; attr = attr->next) - if (!strcmp((const char *) attr->name, "value")) - value = mp::xml::get_text(attr->children); + if (!strcmp((const char *) attr->name, "name")) + name = mp::xml::get_text(attr->children); else throw mp::filter::FilterException( "Bad attribute " + std::string((const char *) attr->name)); - zorba_script = value; + zorba_script = name; } else if (!strcmp((const char *) ptr->name, "record")) { - std::string value; + std::string name; struct _xmlAttr *attr; for (attr = ptr->properties; attr; attr = attr->next) - if (!strcmp((const char *) attr->name, "value")) - value = mp::xml::get_text(attr->children); + if (!strcmp((const char *) attr->name, "name")) + name = mp::xml::get_text(attr->children); else throw mp::filter::FilterException( "Bad attribute " + std::string((const char *) attr->name)); - zorba_record_variable = value; + zorba_record_variable = name; } else { @@ -366,14 +395,19 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only, lQuery = lZorba->createQuery(); - size_t t = zorba_script.find_last_of('/'); - if (t != std::string::npos) - lQuery->setFileName(zorba_script.substr(0, t + 1)); - - std::unique_ptr qfile( - new std::ifstream(zorba_script.c_str())); - Zorba_CompilerHints lHints; - lQuery->compile(*qfile, lHints); + try { + size_t t = zorba_script.find_last_of('/'); + if (t != std::string::npos) + lQuery->setFileName(zorba_script.substr(0, t + 1)); + std::unique_ptr qfile( + new std::ifstream(zorba_script.c_str())); + Zorba_CompilerHints lHints; + lQuery->compile(*qfile, lHints); + } catch ( ZorbaException &e) { + std::string msg = "XQuery compile: "; + msg += e.what(); + throw mp::filter::FilterException(msg); + } } }