* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.57 2005-06-13 10:27:00 adam Exp $
+ * $Id: seshigh.c,v 1.58 2005-06-25 15:46:05 adam Exp $
*/
/**
* \file seshigh.c
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);
}
}
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;
+ 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,
- YAZ_SRW_AUTHENTICATION_ERROR, 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;
+ if (binitres->errcode)
+ {
+ assoc->state = ASSOC_DEAD;
+ yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode,
+ binitres->errstring);
+ return 0;
+ }
+ return 1;
}
return 1;
}
}
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 srw_errcode = 0;
const char *add = 0;
char rpn_buf[512];
-
+
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_searchRetrieveResponse *srw_res,
srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
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.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 = 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 (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 &&
- !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;
- }
- }
- }
- }
+ 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.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 = 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 (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 &&
+ !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;
+ }
+ }
+ }
+ }
}
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("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;
srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
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);
-
- 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;
- }
+ 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);
+
+ 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;
+ }
}
}
static void srw_bend_scan(association *assoc, request *req,
- Z_SRW_scanRequest *srw_req,
- Z_SRW_scanResponse *srw_res,
- int *http_code)
+ Z_SRW_scanRequest *srw_req,
+ Z_SRW_scanResponse *srw_res,
+ int *http_code)
{
yaz_log(log_requestdetail, "Got SRW ScanRequest");
srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
if (srw_res->num_diagnostics == 0 && assoc->init)
{
- 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;
-
- 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;
-
- 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,
- 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;
+ 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;
+
+ 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;
+
+ 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,
+ 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;
-
- 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 = "";
- }
+ 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 = "";
+ }
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
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"))
{
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->u.scan_request,
+ res->u.scan_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
}
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 */
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);
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 = YAZ_BIB1_PERMANENT_SYSTEM_ERROR;
- iochan_settimeout(assoc->client_chan, 10);
+ /* 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.57 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.58 $");
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);
+ 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.schema = 0;
(*a->init->bend_fetch)(a->backend, &freq);
- *next = freq.last_in_set ? 0 : recno + 1;
+ *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 */
/* for 'present request out of range',
set addinfo to record position if not set */
if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE &&
- freq.errstring == 0)
+ freq.errstring == 0)
{
sprintf (s, "%d", recno);
freq.errstring = s;
reclist->num_records++;
continue;
}
- if (freq.record == 0) /* no error and no record ? */
- {
- *next = 0; /* signal end-of-set and stop */
- break;
- }
+ 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
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)
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->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 (!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_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);
-
+
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
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->preferredPositionInResponse : 1),
- *req->numberOfTermsRequested,
- (res->stepSize ? *res->stepSize : 0));
+ (req->preferredPositionInResponse ?
+ *req->preferredPositionInResponse : 1),
+ *req->numberOfTermsRequested,
+ (res->stepSize ? *res->stepSize : 0));
wrbuf_scan_term(wr, req->termListAndStartPoint,
- bsrr->attributeset);
-
+ 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)
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 !");
*resp->operationStatus = Z_ExtendedServicesResponse_failure;
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