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
Add tests to non-configuration
[yaz-moved-to-github.git]
/
src
/
seshigh.c
diff --git
a/src/seshigh.c
b/src/seshigh.c
index
1154016
..
3b49190
100644
(file)
--- a/
src/seshigh.c
+++ b/
src/seshigh.c
@@
-665,7
+665,7
@@
static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
Z_OPACRecord *opac = 0;
if (yaz_xml_to_opac(mt, wrbuf_buf(output_record),
wrbuf_len(output_record),
Z_OPACRecord *opac = 0;
if (yaz_xml_to_opac(mt, wrbuf_buf(output_record),
wrbuf_len(output_record),
- &opac, 0 /* iconv */, rr->stream->mem)
+ &opac, 0 /* iconv */, rr->stream->mem, 0)
&& opac)
{
rr->len = -1;
&& opac)
{
rr->len = -1;
@@
-1297,10
+1297,11
@@
static void srw_bend_explain(association *assoc,
static void srw_bend_scan(association *assoc,
Z_SRW_PDU *sr,
static void srw_bend_scan(association *assoc,
Z_SRW_PDU *sr,
- Z_SRW_scanResponse *srw_res,
+ Z_SRW_PDU *res,
int *http_code)
{
Z_SRW_scanRequest *srw_req = sr->u.scan_request;
int *http_code)
{
Z_SRW_scanRequest *srw_req = sr->u.scan_request;
+ Z_SRW_scanResponse *srw_res = res->u.scan_response;
yaz_log(log_requestdetail, "Got SRW ScanRequest");
*http_code = 200;
yaz_log(log_requestdetail, "Got SRW ScanRequest");
*http_code = 200;
@@
-1328,6
+1329,8
@@
static void srw_bend_scan(association *assoc,
bsrr->step_size = &step_size;
bsrr->entries = 0;
bsrr->setname = 0;
bsrr->step_size = &step_size;
bsrr->entries = 0;
bsrr->setname = 0;
+ bsrr->extra_args = sr->extra_args;
+ bsrr->extra_response_data = 0;
if (bsrr->num_entries > 0)
{
if (bsrr->num_entries > 0)
{
@@
-1397,6
+1400,11
@@
static void srw_bend_scan(association *assoc,
&srw_res->num_diagnostics,
YAZ_SRW_UNSUPP_OPERATION, "scan");
}
&srw_res->num_diagnostics,
YAZ_SRW_UNSUPP_OPERATION, "scan");
}
+ if (bsrr->extra_response_data)
+ {
+ res->extraResponseData_buf = bsrr->extra_response_data;
+ res->extraResponseData_len = strlen(bsrr->extra_response_data);
+ }
if (bsrr->errcode)
{
int srw_error;
if (bsrr->errcode)
{
int srw_error;
@@
-1881,7
+1889,7
@@
static void process_http_request(association *assoc, request *req)
res->u.scan_response->diagnostics = diagnostic;
res->u.scan_response->num_diagnostics = num_diagnostic;
}
res->u.scan_response->diagnostics = diagnostic;
res->u.scan_response->num_diagnostics = num_diagnostic;
}
- srw_bend_scan(assoc, sr, res->u.scan_response, &http_code);
+ srw_bend_scan(assoc, sr, res, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
}
if (http_code == 200)
soap_package->u.generic->p = res;
}
@@
-3044,6
+3052,8
@@
static Z_APDU *process_scanRequest(association *assoc, request *reqb)
bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo,
yaz_oid_userinfo_scan_set, 1, 0);
bsrr->entries = 0;
bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo,
yaz_oid_userinfo_scan_set, 1, 0);
bsrr->entries = 0;
+ bsrr->extra_args = 0;
+ bsrr->extra_response_data = 0;
/* For YAZ 2.0 and earlier it was the backend handler that
initialized entries (member display_term did not exist)
YAZ 2.0 and later sets 'entries' and initialize all members
/* For YAZ 2.0 and earlier it was the backend handler that
initialized entries (member display_term did not exist)
YAZ 2.0 and later sets 'entries' and initialize all members