* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.52 2005-04-14 11:59:46 adam Exp $
+ * $Id: seshigh.c,v 1.79 2006-05-08 19:48:26 adam Exp $
*/
/**
* \file seshigh.c
#include <yaz/comstack.h>
#include "eventl.h"
#include "session.h"
+#include "mime.h"
#include <yaz/proto.h>
#include <yaz/oid.h>
#include <yaz/log.h>
#include <yaz/logrpn.h>
+#include <yaz/querytowrbuf.h>
#include <yaz/statserv.h>
#include <yaz/diagbib1.h>
#include <yaz/charneg.h>
static int process_z_response(association *assoc, request *req, Z_APDU *res);
static Z_APDU *process_initRequest(association *assoc, request *reqb);
static Z_External *init_diagnostics(ODR odr, int errcode,
- const char *errstring);
+ const char *errstring);
static Z_APDU *process_searchRequest(association *assoc, request *reqb,
int *fd);
static Z_APDU *response_searchRequest(association *assoc, request *reqb,
static void wr_diag(WRBUF w, int error, const char *addinfo)
{
wrbuf_printf(w, "ERROR [%d] %s%s%s",
- error, diagbib1_str(error),
- addinfo ? "--" : "", addinfo ? addinfo : "");
+ error, diagbib1_str(error),
+ addinfo ? "--" : "", addinfo ? addinfo : "");
}
* Returns: 0 or a new association handle.
*/
association *create_association(IOCHAN channel, COMSTACK link,
- const char *apdufile)
+ const char *apdufile)
{
association *anew;
}
else if (*apdufile != '-')
{
- char filename[256];
- sprintf(filename, "%.200s.%ld", apdufile, (long)getpid());
- if (!(f = fopen(filename, "w")))
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename);
- return 0;
- }
- setvbuf(f, 0, _IONBF, 0);
+ char filename[256];
+ sprintf(filename, "%.200s.%ld", apdufile, (long)getpid());
+ if (!(f = fopen(filename, "w")))
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename);
+ return 0;
+ }
+ setvbuf(f, 0, _IONBF, 0);
odr_setprint(anew->print, f);
}
}
request_initq(&anew->incoming);
request_initq(&anew->outgoing);
anew->proto = cs_getproto(link);
- anew->cql_transform = 0;
- anew->server_node_ptr = 0;
+ anew->server = 0;
return anew;
}
request_release(req);
yaz_log(log_requestdetail, "v2 client. No Close PDU");
iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */
+ a->cs_put_mask = 0;
}
a->state = ASSOC_DEAD;
}
if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] "
- "[near byte %d] ",
+ "[near byte %ld] ",
odr_errmsg(odr_geterror(assoc->decode)),
odr_getelement(assoc->decode),
- odr_offset(assoc->decode));
+ (long) odr_offset(assoc->decode));
if (assoc->decode->error != OHTTP)
{
yaz_log(YLOG_WARN, "PDU dump:");
assoc->init->bend_fetch = NULL;
assoc->init->bend_explain = NULL;
assoc->init->bend_srw_scan = NULL;
+ assoc->init->bend_srw_update = NULL;
assoc->init->charneg_request = NULL;
assoc->init->charneg_response = NULL;
yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name);
}
-static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num)
+static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_SRW_PDU *sr)
{
statserv_options_block *cb = statserv_getcontrol();
if (!assoc->init)
{
- const char *encoding = "UTF-8";
- Z_External *ce;
- bend_initresult *binitres;
+ const char *encoding = "UTF-8";
+ Z_External *ce;
+ bend_initresult *binitres;
+
+ yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname);
+ assoc_init_reset(assoc);
+
+ assoc->maximumRecordSize = 3000000;
+ assoc->preferredMessageSize = 3000000;
+
+ if (sr->username)
+ {
+ Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth));
+ int len;
+
+ len = strlen(sr->username) + 1;
+ if (sr->password)
+ len += strlen(sr->password) + 2;
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = odr_malloc(assoc->decode, len);
+ strcpy(auth->u.open, sr->username);
+ if (sr->password && *sr->password)
+ {
+ strcat(auth->u.open, "/");
+ strcat(auth->u.open, sr->password);
+ }
+ assoc->init->auth = auth;
+ }
- yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname);
- assoc_init_reset(assoc);
-
- assoc->maximumRecordSize = 3000000;
- assoc->preferredMessageSize = 3000000;
#if 1
- ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1);
- assoc->init->charneg_request = ce->u.charNeg3;
+ ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1);
+ assoc->init->charneg_request = ce->u.charNeg3;
#endif
- assoc->backend = 0;
- if (!(binitres = (*cb->bend_init)(assoc->init)))
- {
- assoc->state = ASSOC_DEAD;
- yaz_add_srw_diagnostic(assoc->encode, d, num, 3, 0);
- return 0;
- }
- assoc->backend = binitres->handle;
- if (binitres->errcode)
- {
- assoc->state = ASSOC_DEAD;
- yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode,
- binitres->errstring);
- return 0;
- }
- return 1;
+ assoc->backend = 0;
+ if (!(binitres = (*cb->bend_init)(assoc->init)))
+ {
+ assoc->state = ASSOC_DEAD;
+ yaz_add_srw_diagnostic(assoc->encode, d, num,
+ YAZ_SRW_AUTHENTICATION_ERROR, 0);
+ return 0;
+ }
+ assoc->backend = binitres->handle;
+ assoc->init->auth = 0;
+ if (binitres->errcode)
+ {
+ int srw_code = yaz_diag_bib1_to_srw(binitres->errcode);
+ assoc->state = ASSOC_DEAD;
+ yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code,
+ binitres->errstring);
+ return 0;
+ }
+ return 1;
}
return 1;
}
+static const char *get_esn(Z_RecordComposition *comp)
+{
+ if (comp && comp->which == Z_RecordComp_complex)
+ {
+ if (comp->u.complex->generic
+ && comp->u.complex->generic->elementSpec
+ && (comp->u.complex->generic->elementSpec->which ==
+ Z_ElementSpec_elementSetName))
+ return comp->u.complex->generic->elementSpec->u.elementSetName;
+ }
+ else if (comp && comp->which == Z_RecordComp_simple &&
+ comp->u.simple->which == Z_ElementSetNames_generic)
+ return comp->u.simple->u.generic;
+ return 0;
+}
+
+static void set_esn(Z_RecordComposition **comp_p, const char *esn, NMEM nmem)
+{
+ Z_RecordComposition *comp = nmem_malloc(nmem, sizeof(*comp));
+
+ comp->which = Z_RecordComp_simple;
+ comp->u.simple = nmem_malloc(nmem, sizeof(*comp->u.simple));
+ comp->u.simple->which = Z_ElementSetNames_generic;
+ comp->u.simple->u.generic = nmem_strdup(nmem, esn);
+ *comp_p = comp;
+}
+
+static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
+{
+#if HAVE_XML2
+ yaz_record_conv_t rc = 0;
+ const char *match_schema = 0;
+ int *match_syntax = 0;
+
+ if (assoc->server)
+ {
+ int r;
+ const char *input_schema = get_esn(rr->comp);
+ Odr_oid *input_syntax_raw = rr->request_format_raw;
+
+ const char *backend_schema = 0;
+ Odr_oid *backend_syntax = 0;
+
+ r = yaz_retrieval_request(assoc->server->retrieval,
+ input_schema,
+ input_syntax_raw,
+ &match_schema,
+ &match_syntax,
+ &rc,
+ &backend_schema,
+ &backend_syntax);
+ yaz_log(YLOG_LOG, "yaz_retrieval_request r=%d", r);
+ if (r == -1) /* error ? */
+ {
+ const char *details = yaz_retrieval_get_error(
+ assoc->server->retrieval);
+
+ rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ return -1;
+ }
+ else if (r == 1 || r == 3)
+ {
+ const char *details = input_schema;
+ rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ return -1;
+ }
+ else if (r == 2)
+ {
+ rr->errcode = YAZ_BIB1_RECORD_SYNTAX_UNSUPP;
+ if (input_syntax_raw)
+ {
+ char oidbuf[OID_STR_MAX];
+ oid_to_dotstring(input_syntax_raw, oidbuf);
+ rr->errstring = odr_strdup(rr->stream, oidbuf);
+ }
+ return -1;
+ }
+ if (backend_schema)
+ {
+ set_esn(&rr->comp, backend_schema, rr->stream->mem);
+ }
+ if (backend_syntax)
+ {
+ oident *oident_syntax = oid_getentbyoid(backend_syntax);
+
+ rr->request_format_raw = backend_syntax;
+
+ if (oident_syntax)
+ rr->request_format = oident_syntax->value;
+ else
+ rr->request_format = VAL_NONE;
+ }
+ }
+ (*assoc->init->bend_fetch)(assoc->backend, rr);
+ if (rc && rr->record && rr->errcode == 0 && rr->len > 0)
+ { /* post conversion must take place .. */
+ WRBUF output_record = wrbuf_alloc();
+ int r = yaz_record_conv_record(rc, rr->record, rr->len, output_record);
+ if (r)
+ {
+ const char *details = yaz_record_conv_get_error(rc);
+ rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ }
+ else
+ {
+ rr->len = wrbuf_len(output_record);
+ rr->record = odr_malloc(rr->stream, rr->len);
+ memcpy(rr->record, wrbuf_buf(output_record), rr->len);
+ }
+ wrbuf_free(output_record, 1);
+ }
+ if (match_syntax)
+ {
+ struct oident *oi = oid_getentbyoid(match_syntax);
+ rr->output_format = oi ? oi->value : VAL_NONE;
+ rr->output_format_raw = match_syntax;
+ }
+ if (match_schema)
+ rr->schema = odr_strdup(rr->stream, match_schema);
+ return 0;
+#else
+ (*assoc->init->bend_fetch)(assoc->backend, rr);
+#endif
+}
+
static int srw_bend_fetch(association *assoc, int pos,
Z_SRW_searchRetrieveRequest *srw_req,
Z_SRW_record *record)
if (!assoc->init->bend_fetch)
return 1;
- (*assoc->init->bend_fetch)(assoc->backend, &rr);
+ retrieve_fetch(assoc, &rr);
if (rr.errcode && rr.surrogate_flag)
{
}
static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
- Z_Query *query_result)
+ Z_Query *query_result)
{
/* have a CQL query and CQL to PQF transform .. */
CQL_parser cp = cql_parser_create();
int r;
int srw_errcode = 0;
const char *add = 0;
- char rpn_buf[512];
-
+ char rpn_buf[5120];
+
r = cql_parser_string(cp, cql);
if (r)
{
- /* CQL syntax error */
- srw_errcode = 10;
+ /* CQL syntax error */
+ srw_errcode = 10;
}
if (!r)
{
- /* Syntax OK */
- r = cql_transform_buf(ct,
- cql_parser_result(cp),
- rpn_buf, sizeof(rpn_buf)-1);
- if (r)
- srw_errcode = cql_transform_error(ct, &add);
+ /* Syntax OK */
+ r = cql_transform_buf(ct,
+ cql_parser_result(cp),
+ rpn_buf, sizeof(rpn_buf)-1);
+ if (r)
+ srw_errcode = cql_transform_error(ct, &add);
}
if (!r)
{
- /* Syntax & transform OK. */
- /* Convert PQF string to Z39.50 to RPN query struct */
- YAZ_PQF_Parser pp = yaz_pqf_create();
- Z_RPNQuery *rpnquery = yaz_pqf_parse(pp, odr, rpn_buf);
- if (!rpnquery)
- {
- size_t off;
- const char *pqf_msg;
- int code = yaz_pqf_error(pp, &pqf_msg, &off);
- yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)",
- pqf_msg, code);
- srw_errcode = 10;
- }
- else
- {
- query_result->which = Z_Query_type_1;
- query_result->u.type_1 = rpnquery;
- }
- yaz_pqf_destroy(pp);
+ /* Syntax & transform OK. */
+ /* Convert PQF string to Z39.50 to RPN query struct */
+ YAZ_PQF_Parser pp = yaz_pqf_create();
+ Z_RPNQuery *rpnquery = yaz_pqf_parse(pp, odr, rpn_buf);
+ if (!rpnquery)
+ {
+ size_t off;
+ const char *pqf_msg;
+ int code = yaz_pqf_error(pp, &pqf_msg, &off);
+ yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)",
+ pqf_msg, code);
+ srw_errcode = 10;
+ }
+ else
+ {
+ query_result->which = Z_Query_type_1;
+ query_result->u.type_1 = rpnquery;
+ }
+ yaz_pqf_destroy(pp);
}
cql_parser_destroy(cp);
return srw_errcode;
}
static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct,
- Z_AttributesPlusTerm *result)
+ Z_AttributesPlusTerm *result)
{
Z_Query query;
Z_RPNQuery *rpn;
int srw_error = cql2pqf(odr, cql, ct, &query);
if (srw_error)
- return srw_error;
+ return srw_error;
if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101)
- return 10; /* bad query type */
+ return 10; /* bad query type */
rpn = query.u.type_1;
if (!rpn->RPNStructure)
- return 10; /* must be structure */
+ return 10; /* must be structure */
if (rpn->RPNStructure->which != Z_RPNStructure_simple)
- return 10; /* must be simple */
+ return 10; /* must be simple */
if (rpn->RPNStructure->u.simple->which != Z_Operand_APT)
- return 10; /* must be attributes plus term node .. */
+ return 10; /* must be attributes plus term node .. */
memcpy(result, rpn->RPNStructure->u.simple->u.attributesPlusTerm,
- sizeof(*result));
+ sizeof(*result));
return 0;
}
-
+
static void srw_bend_search(association *assoc, request *req,
- Z_SRW_searchRetrieveRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_searchRetrieveResponse *srw_res,
int *http_code)
{
int srw_error = 0;
Z_External *ext;
+ Z_SRW_searchRetrieveRequest *srw_req = sr->u.request;
*http_code = 200;
yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest");
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
- if (srw_req->sort_type != Z_SRW_sort_type_none)
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics, 80, 0);
- else if (srw_res->num_diagnostics == 0 && assoc->init)
- {
- bend_search_rr rr;
- rr.setname = "default";
- rr.replace_set = 1;
- rr.num_bases = 1;
- rr.basenames = &srw_req->database;
- rr.referenceId = 0;
-
- rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
- rr.query->u.type_1 = 0;
-
- if (srw_req->query_type == Z_SRW_query_type_cql)
- {
- if (assoc->cql_transform)
- {
- int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql,
- assoc->cql_transform, rr.query);
- if (srw_errcode)
- {
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- srw_errcode, 0);
- }
- }
- else
- {
- /* CQL query to backend. Wrap it - Z39.50 style */
- ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext));
- ext->direct_reference = odr_getoidbystr(assoc->decode,
- "1.2.840.10003.16.2");
- ext->indirect_reference = 0;
- ext->descriptor = 0;
- ext->which = Z_External_CQL;
- ext->u.cql = srw_req->query.cql;
-
- rr.query->which = Z_Query_type_104;
- rr.query->u.type_104 = ext;
- }
- }
- else if (srw_req->query_type == Z_SRW_query_type_pqf)
- {
- Z_RPNQuery *RPNquery;
- YAZ_PQF_Parser pqf_parser;
-
- pqf_parser = yaz_pqf_create ();
-
- RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode,
- srw_req->query.pqf);
- if (!RPNquery)
- {
- const char *pqf_msg;
- size_t off;
- int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
- yaz_log(log_requestdetail, "Parse error %d %s near offset %d",
- code, pqf_msg, off);
- srw_error = 10;
- }
-
- rr.query->which = Z_Query_type_1;
- rr.query->u.type_1 = RPNquery;
-
- yaz_pqf_destroy (pqf_parser);
- }
- else
- {
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics, 11, 0);
- }
- if (rr.query->u.type_1)
- {
- rr.stream = assoc->encode;
- rr.decode = assoc->decode;
- rr.print = assoc->print;
- rr.request = req;
- rr.association = assoc;
- rr.fd = 0;
- rr.hits = 0;
- rr.errcode = 0;
- rr.errstring = 0;
- rr.search_info = 0;
- yaz_log_zquery_level(log_requestdetail,rr.query);
-
- (assoc->init->bend_search)(assoc->backend, &rr);
- if (rr.errcode)
- {
- if (rr.errcode == 109) /* database unavailable */
- {
- *http_code = 404;
- }
- else
- {
- srw_error = yaz_diag_bib1_to_srw (rr.errcode);
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- srw_error, rr.errstring);
- }
- }
- else
- {
- int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0;
- int start = srw_req->startRecord ? *srw_req->startRecord : 1;
-
- yaz_log(log_requestdetail, "Request to pack %d+%d out of %d",
- start, number, rr.hits);
-
- srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits);
- if (number > 0)
- {
- int i;
-
- if (start > rr.hits)
- {
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 61, 0);
- }
- else
- {
- int j = 0;
- int packing = Z_SRW_recordPacking_string;
- if (start + number > rr.hits)
- number = rr.hits - start + 1;
- if (srw_req->recordPacking &&
- !strcmp(srw_req->recordPacking, "xml"))
- packing = Z_SRW_recordPacking_XML;
- srw_res->records = (Z_SRW_record *)
- odr_malloc(assoc->encode,
- number * sizeof(*srw_res->records));
- for (i = 0; i<number; i++)
- {
- int errcode;
-
- srw_res->records[j].recordPacking = packing;
- srw_res->records[j].recordData_buf = 0;
- yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
- errcode = srw_bend_fetch(assoc, i+start, srw_req,
- srw_res->records + j);
- if (errcode)
- {
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- yaz_diag_bib1_to_srw (errcode),
- rr.errstring);
-
- break;
- }
- if (srw_res->records[j].recordData_buf)
- j++;
- }
- srw_res->num_records = j;
- if (!j)
- srw_res->records = 0;
- }
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
+ if (srw_res->num_diagnostics == 0 && assoc->init)
+ {
+ bend_search_rr rr;
+ rr.setname = "default";
+ rr.replace_set = 1;
+ rr.num_bases = 1;
+ rr.basenames = &srw_req->database;
+ rr.referenceId = 0;
+ rr.srw_sortKeys = 0;
+ rr.srw_setname = 0;
+ rr.srw_setnameIdleTime = 0;
+ rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
+ rr.query->u.type_1 = 0;
+
+ if (srw_req->query_type == Z_SRW_query_type_cql)
+ {
+ if (assoc->server && assoc->server->cql_transform)
+ {
+ int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql,
+ assoc->server->cql_transform,
+ rr.query);
+ if (srw_errcode)
+ {
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ srw_errcode, 0);
+ }
+ }
+ else
+ {
+ /* CQL query to backend. Wrap it - Z39.50 style */
+ ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext));
+ ext->direct_reference = odr_getoidbystr(assoc->decode,
+ "1.2.840.10003.16.2");
+ ext->indirect_reference = 0;
+ ext->descriptor = 0;
+ ext->which = Z_External_CQL;
+ ext->u.cql = srw_req->query.cql;
+
+ rr.query->which = Z_Query_type_104;
+ rr.query->u.type_104 = ext;
+ }
+ }
+ else if (srw_req->query_type == Z_SRW_query_type_pqf)
+ {
+ Z_RPNQuery *RPNquery;
+ YAZ_PQF_Parser pqf_parser;
+
+ pqf_parser = yaz_pqf_create ();
+
+ RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode,
+ srw_req->query.pqf);
+ if (!RPNquery)
+ {
+ const char *pqf_msg;
+ size_t off;
+ int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ yaz_log(log_requestdetail, "Parse error %d %s near offset %ld",
+ code, pqf_msg, (long) off);
+ srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR;
+ }
+
+ rr.query->which = Z_Query_type_1;
+ rr.query->u.type_1 = RPNquery;
+
+ yaz_pqf_destroy (pqf_parser);
+ }
+ else
+ {
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRW_UNSUPP_QUERY_TYPE, 0);
+ }
+ if (rr.query->u.type_1)
+ {
+ rr.stream = assoc->encode;
+ rr.decode = assoc->decode;
+ rr.print = assoc->print;
+ rr.request = req;
+ if ( srw_req->sort.sortKeys )
+ rr.srw_sortKeys = odr_strdup(assoc->encode,
+ srw_req->sort.sortKeys );
+ rr.association = assoc;
+ rr.fd = 0;
+ rr.hits = 0;
+ rr.errcode = 0;
+ rr.errstring = 0;
+ rr.search_info = 0;
+ yaz_log_zquery_level(log_requestdetail,rr.query);
+
+ (assoc->init->bend_search)(assoc->backend, &rr);
+ if (rr.errcode)
+ {
+ if (rr.errcode == YAZ_BIB1_DATABASE_UNAVAILABLE)
+ {
+ *http_code = 404;
+ }
+ else
+ {
+ srw_error = yaz_diag_bib1_to_srw (rr.errcode);
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ srw_error, rr.errstring);
+ }
+ }
+ else
+ {
+ int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0;
+ int start = srw_req->startRecord ? *srw_req->startRecord : 1;
+
+ yaz_log(log_requestdetail, "Request to pack %d+%d out of %d",
+ start, number, rr.hits);
+
+ srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits);
+ if (rr.srw_setname)
+ {
+ srw_res->resultSetId =
+ odr_strdup(assoc->encode, rr.srw_setname );
+ srw_res->resultSetIdleTime =
+ odr_intdup(assoc->encode, *rr.srw_setnameIdleTime );
}
- }
- }
+ if (number > 0)
+ {
+ int i;
+
+ if (start > rr.hits)
+ {
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0);
+ }
+ else
+ {
+ int j = 0;
+ int packing = Z_SRW_recordPacking_string;
+ if (start + number > rr.hits)
+ number = rr.hits - start + 1;
+ if (srw_req->recordPacking){
+ if (!strcmp(srw_req->recordPacking, "xml"))
+ packing = Z_SRW_recordPacking_XML;
+ if (!strcmp(srw_req->recordPacking, "url"))
+ packing = Z_SRW_recordPacking_URL;
+ }
+ srw_res->records = (Z_SRW_record *)
+ odr_malloc(assoc->encode,
+ number * sizeof(*srw_res->records));
+
+ srw_res->extra_records = (Z_SRW_extra_record **)
+ odr_malloc(assoc->encode,
+ number*sizeof(*srw_res->extra_records));
+
+ for (i = 0; i<number; i++)
+ {
+ int errcode;
+
+ srw_res->records[j].recordPacking = packing;
+ srw_res->records[j].recordData_buf = 0;
+ srw_res->extra_records[j] = 0;
+ yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
+ errcode = srw_bend_fetch(assoc, i+start, srw_req,
+ srw_res->records + j);
+ if (errcode)
+ {
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ yaz_diag_bib1_to_srw (errcode),
+ rr.errstring);
+
+ break;
+ }
+ if (srw_res->records[j].recordData_buf)
+ j++;
+ }
+ srw_res->num_records = j;
+ if (!j)
+ srw_res->records = 0;
+ }
+ }
+ }
+ }
}
if (log_request)
{
- const char *querystr = "?";
- const char *querytype = "?";
+ const char *querystr = "?";
+ const char *querytype = "?";
WRBUF wr = wrbuf_alloc();
- switch (srw_req->query_type)
- {
- case Z_SRW_query_type_cql:
- querytype = "CQL";
- querystr = srw_req->query.cql;
- break;
- case Z_SRW_query_type_pqf:
- querytype = "PQF";
- querystr = srw_req->query.pqf;
- break;
- }
+ switch (srw_req->query_type)
+ {
+ case Z_SRW_query_type_cql:
+ querytype = "CQL";
+ querystr = srw_req->query.cql;
+ break;
+ case Z_SRW_query_type_pqf:
+ querytype = "PQF";
+ querystr = srw_req->query.pqf;
+ break;
+ }
wrbuf_printf(wr, "SRWSearch ");
if (srw_res->num_diagnostics)
wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri);
- else if (*http_code != 200)
- wrbuf_printf(wr, "ERROR info:http/%d", *http_code);
+ else if (*http_code != 200)
+ wrbuf_printf(wr, "ERROR info:http/%d", *http_code);
else if (srw_res->numberOfRecords)
- {
+ {
wrbuf_printf(wr, "OK %d",
- (srw_res->numberOfRecords ?
- *srw_res->numberOfRecords : 0));
- }
- wrbuf_printf(wr, " %s %d+%d",
- (srw_res->resultSetId ?
- srw_res->resultSetId : "-"),
- (srw_req->startRecord ? *srw_req->startRecord : 1),
- srw_res->num_records);
+ (srw_res->numberOfRecords ?
+ *srw_res->numberOfRecords : 0));
+ }
+ wrbuf_printf(wr, " %s %d+%d",
+ (srw_res->resultSetId ?
+ srw_res->resultSetId : "-"),
+ (srw_req->startRecord ? *srw_req->startRecord : 1),
+ srw_res->num_records);
yaz_log(log_request, "%s %s: %s", wrbuf_buf(wr), querytype, querystr);
wrbuf_free(wr, 1);
}
#if HAVE_XML2
xmlNodePtr ptr = rr->server_node_ptr;
if (!ptr)
- return 0;
+ return 0;
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
- if (ptr->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr->name, "explain"))
- {
- int len;
- xmlDocPtr doc = xmlNewDoc("1.0");
- xmlChar *buf_out;
- char *content;
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) ptr->name, "explain"))
+ {
+ int len;
+ xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");
+ xmlChar *buf_out;
+ char *content;
- ptr = xmlCopyNode(ptr, 1);
+ ptr = xmlCopyNode(ptr, 1);
- xmlDocSetRootElement(doc, ptr);
-
- xmlDocDumpMemory(doc, &buf_out, &len);
- content = (char*) odr_malloc(rr->stream, 1+len);
- memcpy(content, buf_out, len);
- content[len] = '\0';
-
- xmlFree(buf_out);
- xmlFreeDoc(doc);
- rr->explain_buf = content;
- return 0;
- }
+ xmlDocSetRootElement(doc, ptr);
+
+ xmlDocDumpMemory(doc, &buf_out, &len);
+ content = (char*) odr_malloc(rr->stream, 1+len);
+ memcpy(content, buf_out, len);
+ content[len] = '\0';
+
+ xmlFree(buf_out);
+ xmlFreeDoc(doc);
+ rr->explain_buf = content;
+ return 0;
+ }
}
#endif
return 0;
}
static void srw_bend_explain(association *assoc, request *req,
- Z_SRW_explainRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_explainResponse *srw_res,
int *http_code)
{
+ Z_SRW_explainRequest *srw_req = sr->u.explain_request;
yaz_log(log_requestdetail, "Got SRW ExplainRequest");
*http_code = 404;
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (assoc->init)
{
- bend_explain_rr rr;
-
- rr.stream = assoc->encode;
- rr.decode = assoc->decode;
- rr.print = assoc->print;
- rr.explain_buf = 0;
- rr.database = srw_req->database;
- rr.server_node_ptr = assoc->server_node_ptr;
- rr.schema = "http://explain.z3950.org/dtd/2.0/";
- if (assoc->init->bend_explain)
- (*assoc->init->bend_explain)(assoc->backend, &rr);
- else
- srw_bend_explain_default(assoc->backend, &rr);
+ bend_explain_rr rr;
+
+ rr.stream = assoc->encode;
+ rr.decode = assoc->decode;
+ rr.print = assoc->print;
+ rr.explain_buf = 0;
+ rr.database = srw_req->database;
+ if (assoc->server)
+ rr.server_node_ptr = assoc->server->server_node_ptr;
+ else
+ rr.server_node_ptr = 0;
+ rr.schema = "http://explain.z3950.org/dtd/2.0/";
+ if (assoc->init->bend_explain)
+ (*assoc->init->bend_explain)(assoc->backend, &rr);
+ else
+ srw_bend_explain_default(assoc->backend, &rr);
- if (rr.explain_buf)
- {
- int packing = Z_SRW_recordPacking_string;
- if (srw_req->recordPacking &&
- !strcmp(srw_req->recordPacking, "xml"))
- packing = Z_SRW_recordPacking_XML;
- srw_res->record.recordSchema = rr.schema;
- srw_res->record.recordPacking = packing;
- srw_res->record.recordData_buf = rr.explain_buf;
- srw_res->record.recordData_len = strlen(rr.explain_buf);
- srw_res->record.recordPosition = 0;
- *http_code = 200;
- }
+ if (rr.explain_buf)
+ {
+ int packing = Z_SRW_recordPacking_string;
+ if (srw_req->recordPacking)
+ {
+ if (!strcmp(srw_req->recordPacking, "xml"))
+ packing = Z_SRW_recordPacking_XML;
+ else if (!strcmp(srw_req->recordPacking, "url"))
+ packing = Z_SRW_recordPacking_URL;
+ }
+ srw_res->record.recordSchema = rr.schema;
+ srw_res->record.recordPacking = packing;
+ srw_res->record.recordData_buf = rr.explain_buf;
+ srw_res->record.recordData_len = strlen(rr.explain_buf);
+ srw_res->record.recordPosition = 0;
+ *http_code = 200;
+ }
}
}
static void srw_bend_scan(association *assoc, request *req,
- Z_SRW_scanRequest *srw_req,
- Z_SRW_scanResponse *srw_res,
- int *http_code)
+ Z_SRW_PDU *sr,
+ Z_SRW_scanResponse *srw_res,
+ int *http_code)
{
+ Z_SRW_scanRequest *srw_req = sr->u.scan_request;
yaz_log(log_requestdetail, "Got SRW ScanRequest");
*http_code = 200;
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (srw_res->num_diagnostics == 0 && assoc->init)
{
- struct scan_entry *save_entries;
+ struct scan_entry *save_entries;
- bend_scan_rr *bsrr = (bend_scan_rr *)
- odr_malloc (assoc->encode, sizeof(*bsrr));
- bsrr->num_bases = 1;
- bsrr->basenames = &srw_req->database;
+ bend_scan_rr *bsrr = (bend_scan_rr *)
+ odr_malloc (assoc->encode, sizeof(*bsrr));
+ bsrr->num_bases = 1;
+ bsrr->basenames = &srw_req->database;
- bsrr->num_entries = srw_req->maximumTerms ?
- *srw_req->maximumTerms : 10;
- bsrr->term_position = srw_req->responsePosition ?
- *srw_req->responsePosition : 1;
+ bsrr->num_entries = srw_req->maximumTerms ?
+ *srw_req->maximumTerms : 10;
+ bsrr->term_position = srw_req->responsePosition ?
+ *srw_req->responsePosition : 1;
- bsrr->errcode = 0;
- bsrr->errstring = 0;
- bsrr->referenceId = 0;
- bsrr->stream = assoc->encode;
- bsrr->print = assoc->print;
- bsrr->step_size = odr_intdup(assoc->decode, 0);
- bsrr->entries = 0;
+ bsrr->errcode = 0;
+ bsrr->errstring = 0;
+ bsrr->referenceId = 0;
+ bsrr->stream = assoc->encode;
+ bsrr->print = assoc->print;
+ bsrr->step_size = odr_intdup(assoc->decode, 0);
+ bsrr->entries = 0;
- if (bsrr->num_entries > 0)
- {
- int i;
- bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
- bsrr->num_entries);
- for (i = 0; i<bsrr->num_entries; i++)
- {
- bsrr->entries[i].term = 0;
- bsrr->entries[i].occurrences = 0;
- bsrr->entries[i].errcode = 0;
- bsrr->entries[i].errstring = 0;
- bsrr->entries[i].display_term = 0;
- }
- }
- save_entries = bsrr->entries; /* save it so we can compare later */
+ if (bsrr->num_entries > 0)
+ {
+ int i;
+ bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+ bsrr->num_entries);
+ for (i = 0; i<bsrr->num_entries; i++)
+ {
+ bsrr->entries[i].term = 0;
+ bsrr->entries[i].occurrences = 0;
+ bsrr->entries[i].errcode = 0;
+ bsrr->entries[i].errstring = 0;
+ bsrr->entries[i].display_term = 0;
+ }
+ }
+ save_entries = bsrr->entries; /* save it so we can compare later */
- if (srw_req->query_type == Z_SRW_query_type_pqf &&
- assoc->init->bend_scan)
- {
- Odr_oid *scan_attributeSet = 0;
- oident *attset;
- YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
-
- bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode,
- &scan_attributeSet,
- srw_req->scanClause.pqf);
- if (scan_attributeSet &&
- (attset = oid_getentbyoid(scan_attributeSet)) &&
- (attset->oclass == CLASS_ATTSET ||
- attset->oclass == CLASS_GENERAL))
- bsrr->attributeset = attset->value;
- else
- bsrr->attributeset = VAL_NONE;
- yaz_pqf_destroy(pqf_parser);
- bsrr->scanClause = 0;
- ((int (*)(void *, bend_scan_rr *))
- (*assoc->init->bend_scan))(assoc->backend, bsrr);
- }
- else if (srw_req->query_type == Z_SRW_query_type_cql
- && assoc->init->bend_srw_scan)
- {
- if (assoc->cql_transform)
- {
- int srw_error;
- bsrr->scanClause = 0;
- bsrr->attributeset = VAL_NONE;
- bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
- srw_error = cql2pqf_scan(assoc->encode,
- srw_req->scanClause.cql,
- assoc->cql_transform,
- bsrr->term);
- if (srw_error)
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- srw_error, 0);
- else
- {
- ((int (*)(void *, bend_scan_rr *))
- (*assoc->init->bend_scan))(assoc->backend, bsrr);
- }
- }
- else
- {
- bsrr->term = 0;
- bsrr->attributeset = VAL_NONE;
- bsrr->scanClause = srw_req->scanClause.cql;
- ((int (*)(void *, bend_scan_rr *))
- (*assoc->init->bend_srw_scan))(assoc->backend, bsrr);
- }
- }
- else
- {
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics, 4, "scan");
- }
- if (bsrr->errcode)
- {
- int srw_error;
- if (bsrr->errcode == 109) /* database unavailable */
- {
- *http_code = 404;
- return;
- }
- srw_error = yaz_diag_bib1_to_srw (bsrr->errcode);
-
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- srw_error, bsrr->errstring);
- }
- else if (srw_res->num_diagnostics == 0 && bsrr->num_entries)
- {
- int i;
- srw_res->terms = (Z_SRW_scanTerm*)
- odr_malloc(assoc->encode, sizeof(*srw_res->terms) *
- bsrr->num_entries);
-
- srw_res->num_terms = bsrr->num_entries;
- for (i = 0; i<bsrr->num_entries; i++)
- {
- Z_SRW_scanTerm *t = srw_res->terms + i;
- t->value = odr_strdup(assoc->encode, bsrr->entries[i].term);
- t->numberOfRecords =
- odr_intdup(assoc->encode, bsrr->entries[i].occurrences);
- t->displayTerm = 0;
+ if (srw_req->query_type == Z_SRW_query_type_pqf &&
+ assoc->init->bend_scan)
+ {
+ Odr_oid *scan_attributeSet = 0;
+ oident *attset;
+ YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
+
+ bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode,
+ &scan_attributeSet,
+ srw_req->scanClause.pqf);
+ if (scan_attributeSet &&
+ (attset = oid_getentbyoid(scan_attributeSet)) &&
+ (attset->oclass == CLASS_ATTSET ||
+ attset->oclass == CLASS_GENERAL))
+ bsrr->attributeset = attset->value;
+ else
+ bsrr->attributeset = VAL_NONE;
+ yaz_pqf_destroy(pqf_parser);
+ bsrr->scanClause = 0;
+ ((int (*)(void *, bend_scan_rr *))
+ (*assoc->init->bend_scan))(assoc->backend, bsrr);
+ }
+ else if (srw_req->query_type == Z_SRW_query_type_cql
+ && assoc->init->bend_scan && assoc->server
+ && assoc->server->cql_transform)
+ {
+ int srw_error;
+ bsrr->scanClause = 0;
+ bsrr->attributeset = VAL_NONE;
+ bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
+ srw_error = cql2pqf_scan(assoc->encode,
+ srw_req->scanClause.cql,
+ assoc->server->cql_transform,
+ bsrr->term);
+ if (srw_error)
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ srw_error, 0);
+ else
+ {
+ ((int (*)(void *, bend_scan_rr *))
+ (*assoc->init->bend_scan))(assoc->backend, bsrr);
+ }
+ }
+ else if (srw_req->query_type == Z_SRW_query_type_cql
+ && assoc->init->bend_srw_scan)
+ {
+ bsrr->term = 0;
+ bsrr->attributeset = VAL_NONE;
+ bsrr->scanClause = srw_req->scanClause.cql;
+ ((int (*)(void *, bend_scan_rr *))
+ (*assoc->init->bend_srw_scan))(assoc->backend, bsrr);
+ }
+ else
+ {
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRW_UNSUPP_OPERATION, "scan");
+ }
+ if (bsrr->errcode)
+ {
+ int srw_error;
+ if (bsrr->errcode == YAZ_BIB1_DATABASE_UNAVAILABLE)
+ {
+ *http_code = 404;
+ return;
+ }
+ srw_error = yaz_diag_bib1_to_srw (bsrr->errcode);
+
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ srw_error, bsrr->errstring);
+ }
+ else if (srw_res->num_diagnostics == 0 && bsrr->num_entries)
+ {
+ int i;
+ srw_res->terms = (Z_SRW_scanTerm*)
+ odr_malloc(assoc->encode, sizeof(*srw_res->terms) *
+ bsrr->num_entries);
+
+ srw_res->num_terms = bsrr->num_entries;
+ for (i = 0; i<bsrr->num_entries; i++)
+ {
+ Z_SRW_scanTerm *t = srw_res->terms + i;
+ t->value = odr_strdup(assoc->encode, bsrr->entries[i].term);
+ t->numberOfRecords =
+ odr_intdup(assoc->encode, bsrr->entries[i].occurrences);
+ t->displayTerm = 0;
if (save_entries == bsrr->entries &&
- bsrr->entries[i].display_term)
+ bsrr->entries[i].display_term)
{
/* the entries was _not_ set by the handler. So it's
safe to test for new member display_term. It is
NULL'ed by us.
*/
t->displayTerm = odr_strdup(assoc->encode,
- bsrr->entries[i].display_term);
+ bsrr->entries[i].display_term);
}
- t->whereInList = 0;
- }
- }
+ t->whereInList = 0;
+ }
+ }
}
if (log_request)
{
WRBUF wr = wrbuf_alloc();
- const char *querytype = 0;
- const char *querystr = 0;
+ const char *querytype = 0;
+ const char *querystr = 0;
- switch(srw_req->query_type)
- {
- case Z_SRW_query_type_pqf:
- querytype = "PQF";
- querystr = srw_req->scanClause.pqf;
- break;
- case Z_SRW_query_type_cql:
- querytype = "CQL";
- querystr = srw_req->scanClause.cql;
- break;
- default:
- querytype = "Unknown";
- querystr = "";
- }
+ switch(srw_req->query_type)
+ {
+ case Z_SRW_query_type_pqf:
+ querytype = "PQF";
+ querystr = srw_req->scanClause.pqf;
+ break;
+ case Z_SRW_query_type_cql:
+ querytype = "CQL";
+ querystr = srw_req->scanClause.cql;
+ break;
+ default:
+ querytype = "Unknown";
+ querystr = "";
+ }
wrbuf_printf(wr, "SRWScan %d+%d",
- (srw_req->responsePosition ?
- *srw_req->responsePosition : 1),
- (srw_req->maximumTerms ?
- *srw_req->maximumTerms : 1));
+ (srw_req->responsePosition ?
+ *srw_req->responsePosition : 1),
+ (srw_req->maximumTerms ?
+ *srw_req->maximumTerms : 1));
if (srw_res->num_diagnostics)
wrbuf_printf(wr, " ERROR %s", srw_res->diagnostics[0].uri);
else
}
+static void srw_bend_update(association *assoc, request *req,
+ Z_SRW_PDU *sr,
+ Z_SRW_updateResponse *srw_res,
+ int *http_code)
+{
+ Z_SRW_updateRequest *srw_req = sr->u.update_request;
+ yaz_log(YLOG_DEBUG, "Got SRW UpdateRequest");
+ yaz_log(YLOG_DEBUG, "num_diag = %d", srw_res->num_diagnostics );
+ *http_code = 404;
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
+ if (assoc->init)
+ {
+ bend_update_rr rr;
+
+ rr.stream = assoc->encode;
+ rr.print = assoc->print;
+ rr.num_bases = 1;
+ rr.basenames = &srw_req->database;
+ rr.operation = srw_req->operation;
+ rr.operation_status = "failed";
+ rr.record_id = 0;
+ rr.record_version = 0;
+ rr.record_checksum = 0;
+ rr.record_old_version = 0;
+ rr.record_packing = "xml";
+ rr.record_schema = 0;
+ rr.record_data = 0;
+ rr.request_extra_record = 0;
+ rr.response_extra_record = 0;
+ rr.extra_request_data = 0;
+ rr.extra_response_data = 0;
+ rr.errcode = 0;
+ rr.errstring = 0;
+
+ yaz_log(YLOG_DEBUG, "basename = %s", rr.basenames[0] );
+ yaz_log(YLOG_DEBUG, "Operation = %s", rr.operation );
+ if ( !strcmp( rr.operation, "delete" ) ){
+ if ( !srw_req->recordId ){
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordId" );
+ }
+ else {
+ rr.record_id = srw_req->recordId;
+ }
+ if ( !srw_req->recordVersion ){
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordVersion" );
+ }
+ else {
+ rr.record_version = odr_strdup( assoc->encode,
+ srw_req->recordVersion );
+
+ }
+ if ( srw_req->recordOldVersion ){
+ rr.record_old_version = odr_strdup(assoc->encode,
+ srw_req->recordOldVersion );
+ }
+ if ( srw_req->extraRequestData ){
+ rr.extra_request_data = odr_strdup(assoc->encode,
+ srw_req->extraRequestData );
+ }
+ }
+ else if ( !strcmp( rr.operation, "replace" ) ){
+ if ( !srw_req->recordId ){
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordId" );
+ }
+ else {
+ rr.record_id = srw_req->recordId;
+ }
+ if ( srw_req->record.recordSchema == 0 ){
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordSchema" );
+ }
+ else {
+ rr.record_schema = odr_strdup(assoc->encode,
+ srw_req->record.recordSchema );
+ }
+ switch (srw_req->record.recordPacking)
+ {
+ case Z_SRW_recordPacking_string:
+ rr.record_packing = "string";
+ break;
+ case Z_SRW_recordPacking_XML:
+ rr.record_packing = "xml";
+ break;
+ case Z_SRW_recordPacking_URL:
+ rr.record_packing = "url";
+ break;
+ }
+ if ( srw_req->record.recordData_len ){
+ rr.record_data = odr_strdupn(assoc->encode,
+ srw_req->record.recordData_buf,
+ srw_req->record.recordData_len );
+ rr.request_extra_record = srw_req->extra_record;
+ }
+ else {
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordData" );
+ }
+ if (srw_req->extraRequestData)
+ rr.extra_request_data = odr_strdup(assoc->encode,
+ srw_req->extraRequestData );
+ }
+ else if ( !strcmp( rr.operation, "insert" ) )
+ {
+ if ( srw_req->record.recordSchema == 0 ){
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordSchema" );
+ }
+ else {
+ rr.record_schema = odr_strdup(assoc->encode,
+ srw_req->record.recordSchema);
+ }
+ switch (srw_req->record.recordPacking)
+ {
+ case Z_SRW_recordPacking_string:
+ rr.record_packing = "string";
+ break;
+ case Z_SRW_recordPacking_XML:
+ rr.record_packing = "xml";
+ break;
+ case Z_SRW_recordPacking_URL:
+ rr.record_packing = "url";
+ break;
+ }
+
+ if (srw_req->record.recordData_len)
+ {
+ rr.record_data = odr_strdupn(assoc->encode,
+ srw_req->record.recordData_buf,
+ srw_req->record.recordData_len );
+ rr.request_extra_record = srw_req->extra_record;
+ }
+ else
+ yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ 7, "recordData" );
+ if ( srw_req->extraRequestData )
+ rr.extra_request_data = odr_strdup(assoc->encode,
+ srw_req->extraRequestData );
+ }
+ if (srw_res->num_diagnostics == 0)
+ {
+ if ( assoc->init->bend_srw_update)
+ (*assoc->init->bend_srw_update)(assoc->backend, &rr);
+ else {
+ yaz_log( YLOG_WARN, "Got No Update function!");
+ return;
+ }
+ }
+ if (rr.errcode)
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ rr.errcode, rr.errstring);
+ srw_res->recordId = rr.record_id;
+ srw_res->operationStatus = rr.operation_status;
+ srw_res->recordVersion = rr.record_version;
+ srw_res->recordChecksum = rr.record_checksum;
+ srw_res->extraResponseData = rr.extra_response_data;
+ srw_res->record.recordPosition = 0;
+ if (srw_res->num_diagnostics == 0 && rr.record_data)
+ {
+ srw_res->record.recordSchema = rr.record_schema;
+ srw_res->record.recordPacking = srw_req->record.recordPacking;
+ srw_res->record.recordData_buf = rr.record_data;
+ srw_res->record.recordData_len = strlen(rr.record_data);
+ srw_res->extra_record = rr.response_extra_record;
+
+ }
+ else
+ srw_res->record.recordData_len = 0;
+ *http_code = 200;
+ }
+}
+
+/* check if path is OK (1); BAD (0) */
+static int check_path(const char *path)
+{
+ if (*path != '/')
+ return 0;
+ if (strstr(path, ".."))
+ return 0;
+ return 1;
+}
+
+static char *read_file(const char *fname, ODR o, int *sz)
+{
+ char *buf;
+ FILE *inf = fopen(fname, "rb");
+ if (!inf)
+ return 0;
+
+ fseek(inf, 0L, SEEK_END);
+ *sz = ftell(inf);
+ rewind(inf);
+ buf = odr_malloc(o, *sz);
+ fread(buf, 1, *sz, inf);
+ fclose(inf);
+ return buf;
+}
static void process_http_request(association *assoc, request *req)
{
char *charset = 0;
Z_HTTP_Response *hres = 0;
int keepalive = 1;
- char *stylesheet = 0;
+ const char *stylesheet = 0; /* for now .. set later */
Z_SRW_diagnostic *diagnostic = 0;
int num_diagnostic = 0;
const char *host = z_HTTP_header_lookup(hreq->headers, "Host");
if (!control_association(assoc, host, 0))
{
- p = z_get_HTTP_Response(o, 404);
- r = 1;
+ p = z_get_HTTP_Response(o, 404);
+ r = 1;
}
- if (r == 2 && !strcmp(hreq->path, "/test"))
+ if (r == 2 && assoc->server && assoc->server->docpath
+ && hreq->path[0] == '/'
+ &&
+ /* check if path is a proper prefix of documentroot */
+ strncmp(hreq->path+1, assoc->server->docpath,
+ strlen(assoc->server->docpath))
+ == 0)
{
- p = z_get_HTTP_Response(o, 200);
- hres = p->u.HTTP_Response;
- hres->content_buf = "1234567890\n";
- hres->content_len = strlen(hres->content_buf);
+ if (!check_path(hreq->path))
+ {
+ yaz_log(YLOG_LOG, "File %s access forbidden", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ int content_size = 0;
+ char *content_buf = read_file(hreq->path+1, o, &content_size);
+ if (!content_buf)
+ {
+ yaz_log(YLOG_LOG, "File %s not found", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ const char *ctype = 0;
+ yaz_mime_types types = yaz_mime_types_create();
+
+ yaz_mime_types_add(types, "xsl", "application/xml");
+ yaz_mime_types_add(types, "xml", "application/xml");
+ yaz_mime_types_add(types, "css", "text/css");
+ yaz_mime_types_add(types, "html", "text/html");
+ yaz_mime_types_add(types, "htm", "text/html");
+ yaz_mime_types_add(types, "txt", "text/plain");
+ yaz_mime_types_add(types, "js", "application/x-javascript");
+
+ yaz_mime_types_add(types, "gif", "image/gif");
+ yaz_mime_types_add(types, "png", "image/png");
+ yaz_mime_types_add(types, "jpg", "image/jpeg");
+ yaz_mime_types_add(types, "jpeg", "image/jpeg");
+
+ ctype = yaz_mime_lookup_fname(types, hreq->path);
+ if (!ctype)
+ {
+ yaz_log(YLOG_LOG, "No mime type for %s", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ p = z_get_HTTP_Response(o, 200);
+ hres = p->u.HTTP_Response;
+ hres->content_buf = content_buf;
+ hres->content_len = content_size;
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
+ }
+ yaz_mime_types_destroy(types);
+ }
+ }
r = 1;
}
+
if (r == 2)
{
r = yaz_srw_decode(hreq, &sr, &soap_package, assoc->decode, &charset);
}
else
{
- srw_bend_search(assoc, req, sr->u.request, res->u.response,
+ srw_bend_search(assoc, req, sr, res->u.response,
&http_code);
}
if (http_code == 200)
res->u.explain_response->diagnostics = diagnostic;
res->u.explain_response->num_diagnostics = num_diagnostic;
}
- srw_bend_explain(assoc, req, sr->u.explain_request,
+ srw_bend_explain(assoc, req, sr,
res->u.explain_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
res->u.scan_response->diagnostics = diagnostic;
res->u.scan_response->num_diagnostics = num_diagnostic;
}
- srw_bend_scan(assoc, req, sr->u.scan_request,
- res->u.scan_response, &http_code);
+ srw_bend_scan(assoc, req, sr,
+ res->u.scan_response, &http_code);
+ if (http_code == 200)
+ soap_package->u.generic->p = res;
+ }
+ else if (sr->which == Z_SRW_update_request)
+ {
+ Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_update_response);
+ yaz_log(YLOG_DEBUG, "handling SRW UpdateRequest");
+ if (num_diagnostic)
+ {
+ res->u.update_response->diagnostics = diagnostic;
+ res->u.update_response->num_diagnostics = num_diagnostic;
+ }
+ yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics );
+ srw_bend_update(assoc, req, sr,
+ res->u.update_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
}
else
{
yaz_log(log_request, "SOAP ERROR");
- /* FIXME - what error, what query */
+ /* FIXME - what error, what query */
http_code = 500;
z_soap_error(assoc->encode, soap_package,
"SOAP-ENV:Client", "Bad method", 0);
}
if (http_code == 200 || http_code == 500)
{
- static Z_SOAP_Handler soap_handlers[3] = {
+ static Z_SOAP_Handler soap_handlers[4] = {
#if HAVE_XML2
{"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
{"http://www.loc.gov/zing/srw/v1.0/", 0,
(Z_SOAP_fun) yaz_srw_codec},
+ {"http://www.loc.gov/zing/srw/update/", 0,
+ (Z_SOAP_fun) yaz_ucp_codec},
#endif
{0, 0, 0}
};
int ret;
p = z_get_HTTP_Response(o, 200);
hres = p->u.HTTP_Response;
+
+ if (!stylesheet && assoc->server)
+ stylesheet = assoc->server->stylesheet;
+
+ /* empty stylesheet means NO stylesheet */
+ if (stylesheet && *stylesheet == '\0')
+ stylesheet = 0;
+
ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package,
&hres->content_buf, &hres->content_len,
soap_handlers, charset, stylesheet);
statserv_options_block *cb = 0; /* by default no control for backend */
if (control_association(assoc, get_vhost(req->otherInfo), 1))
- cb = statserv_getcontrol(); /* got control block for backend */
-
+ cb = statserv_getcontrol(); /* got control block for backend */
+
+ if (cb && assoc->backend)
+ (*cb->bend_close)(assoc->backend);
+
yaz_log(log_requestdetail, "Got initRequest");
if (req->implementationId)
yaz_log(log_requestdetail, "Id: %s",
- req->implementationId);
+ req->implementationId);
if (req->implementationName)
yaz_log(log_requestdetail, "Name: %s",
- req->implementationName);
+ req->implementationName);
if (req->implementationVersion)
yaz_log(log_requestdetail, "Version: %s",
- req->implementationVersion);
+ req->implementationVersion);
assoc_init_reset(assoc);
negotiation->which == Z_CharSetandLanguageNegotiation_proposal)
assoc->init->charneg_request = negotiation;
}
-
+
assoc->backend = 0;
if (cb)
{
- if (req->implementationVersion)
- yaz_log(log_requestdetail, "Config: %s",
- cb->configname);
+ if (req->implementationVersion)
+ yaz_log(log_requestdetail, "Config: %s",
+ cb->configname);
iochan_settimeout(assoc->client_chan, cb->idle_timeout * 60);
-
- /* we have a backend control block, so call that init function */
- if (!(binitres = (*cb->bend_init)(assoc->init)))
- {
- yaz_log(YLOG_WARN, "Bad response from backend.");
- return 0;
- }
- assoc->backend = binitres->handle;
+
+ /* we have a backend control block, so call that init function */
+ if (!(binitres = (*cb->bend_init)(assoc->init)))
+ {
+ yaz_log(YLOG_WARN, "Bad response from backend.");
+ return 0;
+ }
+ assoc->backend = binitres->handle;
}
else
{
- /* no backend. return error */
- binitres = odr_malloc(assoc->encode, sizeof(*binitres));
- binitres->errstring = 0;
- binitres->errcode = 1;
+ /* no backend. return error */
+ binitres = odr_malloc(assoc->encode, sizeof(*binitres));
+ binitres->errstring = 0;
+ binitres->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR;
iochan_settimeout(assoc->client_chan, 10);
}
if ((assoc->init->bend_sort))
- yaz_log (YLOG_DEBUG, "Sort handler installed");
+ yaz_log (YLOG_DEBUG, "Sort handler installed");
if ((assoc->init->bend_search))
- yaz_log (YLOG_DEBUG, "Search handler installed");
+ yaz_log (YLOG_DEBUG, "Search handler installed");
if ((assoc->init->bend_present))
- yaz_log (YLOG_DEBUG, "Present handler installed");
+ yaz_log (YLOG_DEBUG, "Present handler installed");
if ((assoc->init->bend_esrequest))
- yaz_log (YLOG_DEBUG, "ESRequest handler installed");
+ yaz_log (YLOG_DEBUG, "ESRequest handler installed");
if ((assoc->init->bend_delete))
- yaz_log (YLOG_DEBUG, "Delete handler installed");
+ yaz_log (YLOG_DEBUG, "Delete handler installed");
if ((assoc->init->bend_scan))
- yaz_log (YLOG_DEBUG, "Scan handler installed");
+ yaz_log (YLOG_DEBUG, "Scan handler installed");
if ((assoc->init->bend_segment))
- yaz_log (YLOG_DEBUG, "Segment handler installed");
+ yaz_log (YLOG_DEBUG, "Segment handler installed");
resp->referenceId = req->referenceId;
*options = '\0';
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.52 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.79 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
{
assoc->state = ASSOC_DEAD;
resp->userInformationField =
- init_diagnostics(assoc->encode, binitres->errcode,
- binitres->errstring);
+ init_diagnostics(assoc->encode, binitres->errcode,
+ binitres->errstring);
*resp->result = 0;
}
if (log_request)
{
- WRBUF wr = wrbuf_alloc();
- wrbuf_printf(wr, "Init ");
- if (binitres->errcode)
- wrbuf_printf(wr, "ERROR %d", binitres->errcode);
- else
- wrbuf_printf(wr, "OK -");
- wrbuf_printf(wr, " ID:%s Name:%s Version:%s",
- (req->implementationId ? req->implementationId :"-"),
- (req->implementationName ?
- req->implementationName : "-"),
- (req->implementationVersion ?
- req->implementationVersion : "-")
- );
- yaz_log(log_request, "%s", wrbuf_buf(wr));
- wrbuf_free(wr, 1);
+ if (!req->idAuthentication)
+ yaz_log(log_request, "Auth none");
+ else if (req->idAuthentication->which == Z_IdAuthentication_open)
+ {
+ const char *open = req->idAuthentication->u.open;
+ const char *slash = strchr(open, '/');
+ int len;
+ if (slash)
+ len = slash - open;
+ else
+ len = strlen(open);
+ yaz_log(log_request, "Auth open %.*s", len, open);
+ }
+ else if (req->idAuthentication->which == Z_IdAuthentication_idPass)
+ {
+ const char *user = req->idAuthentication->u.idPass->userId;
+ const char *group = req->idAuthentication->u.idPass->groupId;
+ yaz_log(log_request, "Auth idPass %s %s",
+ user ? user : "-", group ? group : "-");
+ }
+ else if (req->idAuthentication->which
+ == Z_IdAuthentication_anonymous)
+ {
+ yaz_log(log_request, "Auth anonymous");
+ }
+ else
+ {
+ yaz_log(log_request, "Auth other");
+ }
+ }
+ if (log_request)
+ {
+ WRBUF wr = wrbuf_alloc();
+ wrbuf_printf(wr, "Init ");
+ if (binitres->errcode)
+ wrbuf_printf(wr, "ERROR %d", binitres->errcode);
+ else
+ wrbuf_printf(wr, "OK -");
+ wrbuf_printf(wr, " ID:%s Name:%s Version:%s",
+ (req->implementationId ? req->implementationId :"-"),
+ (req->implementationName ?
+ req->implementationName : "-"),
+ (req->implementationVersion ?
+ req->implementationVersion : "-")
+ );
+ yaz_log(log_request, "%s", wrbuf_buf(wr));
+ wrbuf_free(wr, 1);
}
return apdu;
}
Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec));
yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error),
- addinfo ? " -- " : "", addinfo ? addinfo : "");
+ addinfo ? " -- " : "", addinfo ? addinfo : "");
rec->which = Z_Records_NSD;
rec->u.nonSurrogateDiagnostic = zget_DefaultDiagFormat(assoc->encode,
- error, addinfo);
+ error, addinfo);
return rec;
}
* surrogate diagnostic.
*/
static Z_NamePlusRecord *surrogatediagrec(association *assoc,
- const char *dbname,
+ const char *dbname,
int error, const char *addinfo)
{
yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error),
- addinfo ? " -- " : "", addinfo ? addinfo : "");
+ addinfo ? " -- " : "", addinfo ? addinfo : "");
return zget_surrogateDiagRec(assoc->encode, dbname, error, addinfo);
}
freq.print = a->print;
freq.referenceId = referenceId;
freq.schema = 0;
- (*a->init->bend_fetch)(a->backend, &freq);
+
+ retrieve_fetch(a, &freq);
+
+ *next = freq.last_in_set ? 0 : recno + 1;
+
/* backend should be able to signal whether error is system-wide
or only pertaining to current record */
if (freq.errcode)
*pres = Z_PresentStatus_failure;
/* for 'present request out of range',
set addinfo to record position if not set */
- if (freq.errcode == 13 && freq.errstring == 0)
+ if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE &&
+ freq.errstring == 0)
{
sprintf (s, "%d", recno);
freq.errstring = s;
surrogatediagrec(a, freq.basename, freq.errcode,
freq.errstring);
reclist->num_records++;
- *next = freq.last_in_set ? 0 : recno + 1;
continue;
}
+ if (freq.record == 0) /* no error and no record ? */
+ {
+ *next = 0; /* signal end-of-set and stop */
+ break;
+ }
if (freq.len >= 0)
this_length = freq.len;
else
reclist->records[reclist->num_records] =
surrogatediagrec(a, freq.basename, 16, 0);
reclist->num_records++;
- *next = freq.last_in_set ? 0 : recno + 1;
dumped_records += this_length;
continue;
}
reclist->records[reclist->num_records] =
surrogatediagrec(a, freq.basename, 17, 0);
reclist->num_records++;
- *next = freq.last_in_set ? 0 : recno + 1;
dumped_records += this_length;
continue;
}
if (!(thisrec = (Z_NamePlusRecord *)
odr_malloc(a->encode, sizeof(*thisrec))))
return 0;
- if (freq.basename)
- thisrec->databaseName = odr_strdup(a->encode, freq.basename);
- else
- thisrec->databaseName = 0;
+ if (freq.basename)
+ thisrec->databaseName = odr_strdup(a->encode, freq.basename);
+ else
+ thisrec->databaseName = 0;
thisrec->which = Z_NamePlusRecord_databaseRecord;
if (freq.output_format_raw)
return 0;
reclist->records[reclist->num_records] = thisrec;
reclist->num_records++;
- *next = freq.last_in_set ? 0 : recno + 1;
}
*num = reclist->num_records;
return records;
bsrr->association = assoc;
bsrr->referenceId = req->referenceId;
save_referenceId (reqb, bsrr->referenceId);
+ bsrr->srw_sortKeys = 0;
+ bsrr->srw_setname = 0;
+ bsrr->srw_setnameIdleTime = 0;
yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName);
if (req->databaseNames)
bsrr->errstring = NULL;
bsrr->search_info = NULL;
- if (assoc->cql_transform &&
- req->query->which == Z_Query_type_104 &&
- req->query->u.type_104->which == Z_External_CQL)
- {
- /* have a CQL query and a CQL to PQF transform .. */
- int srw_errcode =
- cql2pqf(bsrr->stream, req->query->u.type_104->u.cql,
- assoc->cql_transform, bsrr->query);
- if (srw_errcode)
- bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode);
- }
- if (!bsrr->errcode)
- (assoc->init->bend_search)(assoc->backend, bsrr);
+ if (assoc->server && assoc->server->cql_transform
+ && req->query->which == Z_Query_type_104
+ && req->query->u.type_104->which == Z_External_CQL)
+ {
+ /* have a CQL query and a CQL to PQF transform .. */
+ int srw_errcode =
+ cql2pqf(bsrr->stream, req->query->u.type_104->u.cql,
+ assoc->server->cql_transform, bsrr->query);
+ if (srw_errcode)
+ bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode);
+ }
+ if (!bsrr->errcode)
+ (assoc->init->bend_search)(assoc->backend, bsrr);
if (!bsrr->request) /* backend not ready with the search response */
return 0; /* should not be used any more */
}
else
form = prefformat->value;
resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form, req->referenceId,
- req->preferredRecordSyntax, NULL);
+ toget, compp, next, presst, form, req->referenceId,
+ req->preferredRecordSyntax, NULL);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
{
WRBUF wr = wrbuf_alloc();
if (bsrt->errcode)
- wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
- else
- wrbuf_printf(wr, "OK %d", bsrt->hits);
- wrbuf_printf(wr, " %s 1+%d ",
- req->resultSetName, returnedrecs);
- wrbuf_put_zquery(wr, req->query);
-
+ wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
+ else
+ wrbuf_printf(wr, "OK %d", bsrt->hits);
+ wrbuf_printf(wr, " %s 1+%d ",
+ req->resultSetName, returnedrecs);
+ yaz_query_to_wrbuf(wr, req->query);
+
yaz_log(log_request, "Search %s", wrbuf_buf(wr));
wrbuf_free(wr, 1);
}
resp->records = diagrec(assoc, bprr->errcode, bprr->errstring);
*resp->presentStatus = Z_PresentStatus_failure;
errcode = bprr->errcode;
- errstring = bprr->errstring;
+ errstring = bprr->errstring;
}
}
apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
*num = *req->numberOfRecordsRequested;
resp->records =
pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
- num, req->recordComposition, next,
- resp->presentStatus,
+ num, req->recordComposition, next,
+ resp->presentStatus,
form, req->referenceId, req->preferredRecordSyntax,
&errcode);
}
wrbuf_printf(wr, "Present ");
if (*resp->presentStatus == Z_PresentStatus_failure)
- wrbuf_printf(wr, "ERROR %d", errcode);
+ wrbuf_printf(wr, "ERROR %d", errcode);
else if (*resp->presentStatus == Z_PresentStatus_success)
wrbuf_printf(wr, "OK -");
else
for (i = 0; i < req->num_databaseNames; i++)
yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]);
}
- yaz_log(log_requestdetail, "pos %d step %d entries %d",
- *req->preferredPositionInResponse, *res->stepSize,
- *req->numberOfTermsRequested);
+ bsrr->scanClause = 0;
+ bsrr->errcode = 0;
+ bsrr->errstring = 0;
bsrr->num_bases = req->num_databaseNames;
bsrr->basenames = req->databaseNames;
bsrr->num_entries = *req->numberOfTermsRequested;
if (bsrr->errcode)
diagrecs_p = zget_DiagRecs(assoc->encode,
- bsrr->errcode, bsrr->errstring);
+ bsrr->errcode, bsrr->errstring);
else
{
int i;
else
{
Z_DiagRecs *drecs = zget_DiagRecs(assoc->encode,
- bsrr->entries[i].errcode,
- bsrr->entries[i].errstring);
+ bsrr->entries[i].errcode,
+ bsrr->entries[i].errstring);
assert (drecs->num_diagRecs == 1);
e->which = Z_Entry_surrogateDiagnostic;
assert (drecs->diagRecs[0]);
{
WRBUF wr = wrbuf_alloc();
if (bsrr->errcode)
- wr_diag(wr, bsrr->errcode, bsrr->errstring);
+ wr_diag(wr, bsrr->errcode, bsrr->errstring);
else if (*res->scanStatus == Z_Scan_success)
wrbuf_printf(wr, "OK");
- else
- wrbuf_printf(wr, "Partial");
+ else
+ wrbuf_printf(wr, "Partial");
wrbuf_printf(wr, " %d+%d %d ",
- *req->preferredPositionInResponse,
- *req->numberOfTermsRequested,
- (res->stepSize ? *res->stepSize : 0));
- wrbuf_scan_term(wr, req->termListAndStartPoint,
- bsrr->attributeset);
-
+ (req->preferredPositionInResponse ?
+ *req->preferredPositionInResponse : 1),
+ *req->numberOfTermsRequested,
+ (res->stepSize ? *res->stepSize : 0));
+ yaz_scan_to_wrbuf(wr, req->termListAndStartPoint,
+ bsrr->attributeset);
yaz_log(log_request, "Scan %s", wrbuf_buf(wr) );
wrbuf_free(wr, 1);
}
if (bsrr->errcode)
{
Z_DiagRecs *dr = zget_DiagRecs(assoc->encode,
- bsrr->errcode, bsrr->errstring);
+ bsrr->errcode, bsrr->errstring);
res->diagnostics = dr->diagRecs;
res->num_diagnostics = dr->num_diagRecs;
}
{
WRBUF wr = wrbuf_alloc();
wrbuf_printf(wr, "Sort ");
- if (bsrr->errcode)
- wrbuf_printf(wr, " ERROR %d", bsrr->errcode);
- else
- wrbuf_printf(wr, "OK -");
- wrbuf_printf(wr, " (");
+ if (bsrr->errcode)
+ wrbuf_printf(wr, " ERROR %d", bsrr->errcode);
+ else
+ wrbuf_printf(wr, "OK -");
+ wrbuf_printf(wr, " (");
for (i = 0; i<req->num_inputResultSetNames; i++)
{
if (i)
static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
{
bend_esrequest_rr esrequest;
+ const char *ext_name = "unknown";
Z_ExtendedServicesRequest *req =
reqb->apdu_request->u.extendedServicesRequest;
Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse;
- yaz_log(log_requestdetail,"Got EsRequest");
-
esrequest.esr = reqb->apdu_request->u.extendedServicesRequest;
esrequest.stream = assoc->encode;
esrequest.decode = assoc->decode;
esrequest.association = assoc;
esrequest.taskPackage = 0;
esrequest.referenceId = req->referenceId;
+
+ if (esrequest.esr && esrequest.esr->taskSpecificParameters)
+ {
+ switch(esrequest.esr->taskSpecificParameters->which)
+ {
+ case Z_External_itemOrder:
+ ext_name = "ItemOrder"; break;
+ case Z_External_update:
+ ext_name = "Update"; break;
+ case Z_External_update0:
+ ext_name = "Update0"; break;
+ case Z_External_ESAdmin:
+ ext_name = "Admin"; break;
+
+ }
+ }
+
(*assoc->init->bend_esrequest)(assoc->backend, &esrequest);
/* If the response is being delayed, return NULL */
if (esrequest.errcode == -1)
{
/* Backend service indicates request will be processed */
- yaz_log(log_request,"EsRequest OK: Accepted !");
+ yaz_log(log_request, "Extended Service: %s (accepted)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_accepted;
}
else if (esrequest.errcode == 0)
{
/* Backend service indicates request will be processed */
- yaz_log(log_request,"EsRequest OK: Done !");
+ yaz_log(log_request, "Extended Service: %s (done)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_done;
}
else
{
Z_DiagRecs *diagRecs =
- zget_DiagRecs(assoc->encode, esrequest.errcode,
- esrequest.errstring);
+ zget_DiagRecs(assoc->encode, esrequest.errcode,
+ esrequest.errstring);
/* Backend indicates error, request will not be processed */
- yaz_log(YLOG_DEBUG,"Request could not be processed...failure !");
+ yaz_log(log_request, "Extended Service: %s (failed)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_failure;
resp->num_diagnostics = diagRecs->num_diagRecs;
resp->diagnostics = diagRecs->diagRecs;
return apdu;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff