#include <metaproxy/util.hpp>
#include <yaz/log.h>
#include <yaz/oid_db.h>
+#include <yaz/diagbib1.h>
#include <map>
#include <string>
#include <iostream>
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
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))
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());
+ }
}
}
}
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<std::istream> 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<std::istream> 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);
+ }
}
}