projects
/
mp-xquery-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c10a116
)
XQuery diagnostic in surrogate diagnostic record
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 16 Jun 2014 11:24:43 +0000
(13:24 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 16 Jun 2014 11:24:43 +0000
(13:24 +0200)
src/metaproxy_filter_xquery.cpp
patch
|
blob
|
history
diff --git
a/src/metaproxy_filter_xquery.cpp
b/src/metaproxy_filter_xquery.cpp
index
bd29487
..
b74885d
100644
(file)
--- 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 <metaproxy/util.hpp>
#include <yaz/log.h>
#include <yaz/oid_db.h>
#include <metaproxy/util.hpp>
#include <yaz/log.h>
#include <yaz/oid_db.h>
+#include <yaz/diagbib1.h>
#include <map>
#include <string>
#include <iostream>
#include <map>
#include <string>
#include <iostream>
@@
-108,8
+109,8
@@
bool yf::XQuery::convert_one_record(const char *input_buf,
result = ss.str();
return true;
} catch ( ZorbaException &e) {
result = ss.str();
return true;
} catch ( ZorbaException &e) {
- std::string msg = e.what();
- yaz_log(YLOG_WARN, "XQuery execute failure: %s", msg.c_str());
+ result = e.what();
+ yaz_log(YLOG_WARN, "XQuery execute: %s", result.c_str());
return false;
}
}
return false;
}
}
@@
-278,11
+279,11
@@
void yf::XQuery::process(Package &package) const
int i;
for (i = 0; i < records->num_records; i++)
{
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;
{
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))
int ret_trans = -1;
if (r->which == Z_External_octet &&
!oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml))
@@
-292,11
+293,18
@@
void yf::XQuery::process(Package &package) const
r->u.octet_aligned->buf, r->u.octet_aligned->len,
result))
{
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());
}
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());
+ }
}
}
}
}
}
}
@@
-381,7
+389,7
@@
void yf::XQuery::configure(const xmlNode * ptr, bool test_only,
Zorba_CompilerHints lHints;
lQuery->compile(*qfile, lHints);
} catch ( ZorbaException &e) {
Zorba_CompilerHints lHints;
lQuery->compile(*qfile, lHints);
} catch ( ZorbaException &e) {
- std::string msg = "XQuery compile failure: ";
+ std::string msg = "XQuery compile: ";
msg += e.what();
throw mp::filter::FilterException(msg);
}
msg += e.what();
throw mp::filter::FilterException(msg);
}