projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-organized MARC-8 charset creating code a bit.
[yaz-moved-to-github.git]
/
ztest
/
ztest.c
diff --git
a/ztest/ztest.c
b/ztest/ztest.c
index
541ed73
..
650236e
100644
(file)
--- a/
ztest/ztest.c
+++ b/
ztest/ztest.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: ztest.c,v 1.93 2007-06-11 08:50:57 adam Exp $
+ * $Id: ztest.c,v 1.95 2007-08-14 12:22:51 adam Exp $
*/
/*
*/
/*
@@
-153,6
+153,7
@@
int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
Z_IORequest *ir = it->u.esRequest;
Z_IOOriginPartToKeep *k = ir->toKeep;
Z_IOOriginPartNotToKeep *n = ir->notToKeep;
Z_IORequest *ir = it->u.esRequest;
Z_IOOriginPartToKeep *k = ir->toKeep;
Z_IOOriginPartNotToKeep *n = ir->notToKeep;
+ const char *xml_in_response = 0;
if (k && k->contact)
{
if (k && k->contact)
{
@@
-192,8
+193,10
@@
int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
{
yaz_log (log_level, "ILL XML request");
if (r->which == Z_External_octet)
{
yaz_log (log_level, "ILL XML request");
if (r->which == Z_External_octet)
- yaz_log (log_level, "%.*s", r->u.octet_aligned->len,
+ yaz_log (log_level, "%.*s",
+ r->u.octet_aligned->len,
r->u.octet_aligned->buf);
r->u.octet_aligned->buf);
+ xml_in_response = "<dummy>x</dummy>";
}
if (!oid_oidcmp(r->direct_reference,
yaz_oid_general_isoill_1))
}
if (!oid_oidcmp(r->direct_reference,
yaz_oid_general_isoill_1))
@@
-300,7
+303,13
@@
int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
ext->u.itemOrder->u.taskPackage->originPart = k;
ext->u.itemOrder->u.taskPackage->targetPart = targetPart;
ext->u.itemOrder->u.taskPackage->originPart = k;
ext->u.itemOrder->u.taskPackage->targetPart = targetPart;
- targetPart->itemRequest = 0;
+ if (xml_in_response)
+ targetPart->itemRequest =
+ z_ext_record_xml(rr->stream, xml_in_response,
+ strlen(xml_in_response));
+ else
+ targetPart->itemRequest = 0;
+
targetPart->statusOrErrorReport = 0;
targetPart->auxiliaryStatus = 0;
}
targetPart->statusOrErrorReport = 0;
targetPart->auxiliaryStatus = 0;
}
@@
-504,17
+513,12
@@
int ztest_present (void *handle, bend_present_rr *rr)
int ztest_fetch(void *handle, bend_fetch_rr *r)
{
char *cp;
int ztest_fetch(void *handle, bend_fetch_rr *r)
{
char *cp;
- oid_class oclass;
- char oid_str_buf[OID_STR_MAX];
- const char *oid_str = 0;
const Odr_oid *oid = r->request_format;
r->last_in_set = 0;
r->basename = "Default";
r->output_format = r->request_format;
const Odr_oid *oid = r->request_format;
r->last_in_set = 0;
r->basename = "Default";
r->output_format = r->request_format;
- oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf);
-
if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
/* this section returns a small record */
if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
/* this section returns a small record */