* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.78 2006-05-08 10:16:47 adam Exp $
+ * $Id: seshigh.c,v 1.98 2006-09-06 09:35:41 adam Exp $
*/
/**
* \file seshigh.c
#include <unistd.h>
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#endif
/* dynamic logging levels */
static int logbits_set = 0;
-static int log_session = 0;
+static int log_session = 0; /* one-line logs for session */
+static int log_sessiondetail = 0; /* more detailed stuff */
static int log_request = 0; /* one-line logs for requests */
static int log_requestdetail = 0; /* more detailed stuff */
{
logbits_set = 1;
log_session = yaz_log_module_level("session");
- log_request = yaz_log_module_level("request");
+ log_sessiondetail = yaz_log_module_level("sessiondetail");
+ log_request = yaz_log_module_level("request");
log_requestdetail = yaz_log_module_level("requestdetail");
}
}
+
+
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 : "");
+ wrbuf_printf(w, "ERROR %d+", error);
+ wrbuf_puts_replace_char(w, diagbib1_str(error), ' ', '_');
+ if (addinfo){
+ wrbuf_puts(w, "+");
+ wrbuf_puts_replace_char(w, addinfo, ' ', '_');
+ }
+
+ wrbuf_puts(w, " ");
}
}
else
{
- yaz_log(log_session, "Session idle too long. Sending close.");
+ yaz_log(log_sessiondetail,
+ "Session idle too long. Sending close.");
do_close(assoc, Z_Close_lackOfActivity, 0);
}
return;
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
- yaz_log(log_session, "Connection closed - end of session");
+ yaz_log(log_sessiondetail, "Connection closed - end of session");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
return;
}
assoc->cs_get_mask = EVENT_INPUT;
- if ((res = cs_get(conn, &assoc->input_buffer,
- &assoc->input_buffer_len)) <= 0)
+ res = cs_get(conn, &assoc->input_buffer,
+ &assoc->input_buffer_len);
+ if (res < 0 && cs_errno(conn) == CSBUFSIZE)
{
- yaz_log(log_session, "Connection closed by client");
+ yaz_log(log_session, "Connection error: %s res=%d",
+ cs_errmsg(cs_errno(conn)), res);
+ req = request_get(&assoc->incoming); /* get a new request */
+ do_close_req(assoc, Z_Close_protocolError,
+ "Incoming package too large", req);
+ return;
+ }
+ else if (res <= 0)
+ {
+ yaz_log(log_sessiondetail, "Connection closed by client");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
yaz_log(YLOG_WARN, "PDU dump:");
odr_dumpBER(yaz_log_file(), assoc->input_buffer, res);
request_release(req);
- do_close(assoc, Z_Close_protocolError,"Malformed package");
+ do_close(assoc, Z_Close_protocolError, "Malformed package");
}
else
{
switch (res = cs_put(conn, req->response, req->len_response))
{
case -1:
- yaz_log(log_session, "Connection closed by client");
+ yaz_log(log_sessiondetail, "Connection closed by client");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
Z_External *ce;
bend_initresult *binitres;
- yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname);
+ yaz_log(log_requestdetail, "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));
static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
yaz_record_conv_t rc = 0;
const char *match_schema = 0;
int *match_syntax = 0;
rr->errstring = odr_strdup(rr->stream, details);
return -1;
}
- else if (r == 1)
+ else if (r == 1 || r == 3)
{
const char *details = input_schema;
rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP;
else if (r == 2)
{
rr->errcode = YAZ_BIB1_RECORD_SYNTAX_UNSUPP;
- return -1;
- }
- else if (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 == 4)
- {
- rr->errcode = YAZ_BIB1_RECORD_NOT_AVAILABLE_IN_REQUESTED_SYNTAX;
+ 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)
static int srw_bend_fetch(association *assoc, int pos,
Z_SRW_searchRetrieveRequest *srw_req,
- Z_SRW_record *record)
+ Z_SRW_record *record,
+ const char **addinfo)
{
bend_fetch_rr rr;
ODR o = assoc->encode;
rr.referenceId = 0;
rr.request_format = VAL_TEXT_XML;
rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode,
- CLASS_TRANSYN,
+ CLASS_RECSYN,
VAL_TEXT_XML);
rr.comp = (Z_RecordComposition *)
odr_malloc(assoc->decode, sizeof(*rr.comp));
rr.len = 0;
rr.record = 0;
rr.last_in_set = 0;
- rr.output_format = VAL_TEXT_XML;
- rr.output_format_raw = 0;
rr.errcode = 0;
rr.errstring = 0;
rr.surrogate_flag = 0;
else
record->recordSchema = 0;
}
- return rr.errcode;
+ if (rr.errcode)
+ {
+ *addinfo = rr.errstring;
+ return rr.errcode;
+ }
+ return 0;
}
static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
}
else
{
- int j = 0;
- int packing = Z_SRW_recordPacking_string;
+ int ok = 1;
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++)
+
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
{
- int errcode;
+ bend_present_rr *bprr = (bend_present_rr*)
+ odr_malloc (assoc->decode, sizeof(*bprr));
+ bprr->setname = "default";
+ bprr->start = start;
+ bprr->number = number;
+ bprr->format = VAL_TEXT_XML;
+ if (srw_req->recordSchema)
+ {
+ bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode,
+ sizeof(*bprr->comp));
+ bprr->comp->which = Z_RecordComp_simple;
+ bprr->comp->u.simple = (Z_ElementSetNames *)
+ odr_malloc(assoc->decode, sizeof(Z_ElementSetNames));
+ bprr->comp->u.simple->which = Z_ElementSetNames_generic;
+ bprr->comp->u.simple->u.generic = srw_req->recordSchema;
+ }
+ else
+ {
+ bprr->comp = 0;
+ }
+ bprr->stream = assoc->encode;
+ bprr->referenceId = 0;
+ bprr->print = assoc->print;
+ bprr->request = req;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ (*assoc->init->bend_present)(assoc->backend, bprr);
- 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)
+ if (!bprr->request)
+ return;
+ if (bprr->errcode)
{
+ srw_error = yaz_diag_bib1_to_srw (bprr->errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
- yaz_diag_bib1_to_srw (errcode),
- rr.errstring);
+ srw_error, bprr->errstring);
+ ok = 0;
+ }
+ }
+
+ if (ok)
+ {
+ int j = 0;
+ int packing = Z_SRW_recordPacking_string;
+ 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;
+ const char *addinfo = 0;
- break;
+ 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,
+ &addinfo);
+ if (errcode)
+ {
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ yaz_diag_bib1_to_srw (errcode),
+ addinfo);
+
+ break;
+ }
+ if (srw_res->records[j].recordData_buf)
+ j++;
}
- if (srw_res->records[j].recordData_buf)
- j++;
+ srw_res->num_records = j;
+ if (!j)
+ srw_res->records = 0;
}
- srw_res->num_records = j;
- if (!j)
- srw_res->records = 0;
}
}
}
break;
}
wrbuf_printf(wr, "SRWSearch ");
+ wrbuf_printf(wr, srw_req->database);
+ wrbuf_printf(wr, " ");
if (srw_res->num_diagnostics)
wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri);
else if (*http_code != 200)
static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
xmlNodePtr ptr = rr->server_node_ptr;
if (!ptr)
return 0;
querystr = srw_req->scanClause.cql;
break;
default:
- querytype = "Unknown";
+ querytype = "UNKNOWN";
querystr = "";
}
- wrbuf_printf(wr, "SRWScan %d+%d",
+
+ wrbuf_printf(wr, "SRWScan ");
+ wrbuf_printf(wr, srw_req->database);
+ wrbuf_printf(wr, " ");
+
+ if (srw_res->num_diagnostics)
+ wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri);
+ else if (srw_res->num_terms)
+ wrbuf_printf(wr, "OK %d - ", srw_res->num_terms);
+ else
+ wrbuf_printf(wr, "OK - - ");
+
+ wrbuf_printf(wr, "%d+%d+0 ",
(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
- wrbuf_printf(wr, " OK -");
- wrbuf_printf(wr, " %s: %s", querytype, querystr);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
+ /* there is no step size in SRU/W ??? */
+ wrbuf_printf(wr, "%s: %s ", querytype, querystr);
+ yaz_log(log_request, "%s ", wrbuf_buf(wr) );
wrbuf_free(wr, 1);
}
rr.response_extra_record = 0;
rr.extra_request_data = 0;
rr.extra_response_data = 0;
- rr.errcode = 0;
- rr.errstring = 0;
+ rr.uri = 0;
+ rr.message = 0;
+ rr.details = 0;
yaz_log(YLOG_DEBUG, "basename = %s", rr.basenames[0] );
yaz_log(YLOG_DEBUG, "Operation = %s", rr.operation );
}
else if ( !strcmp( rr.operation, "insert" ) )
{
+ 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,
return;
}
}
- if (rr.errcode)
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- rr.errcode, rr.errstring);
+
+ if (rr.uri)
+ yaz_add_srw_diagnostic_uri(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ rr.uri,
+ rr.message,
+ rr.details);
srw_res->recordId = rr.record_id;
srw_res->operationStatus = rr.operation_status;
srw_res->recordVersion = rr.record_version;
if (http_code == 200 || http_code == 500)
{
static Z_SOAP_Handler soap_handlers[4] = {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
{"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
{"http://www.loc.gov/zing/srw/v1.0/", 0,
strcat(options, " negotiation");
}
- ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
+ if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
+ ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
{
}
yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options);
- assoc->maximumRecordSize = *req->maximumRecordSize;
- if (cb && assoc->maximumRecordSize > cb->maxrecordsize)
- assoc->maximumRecordSize = cb->maxrecordsize;
- assoc->preferredMessageSize = *req->preferredMessageSize;
- if (assoc->preferredMessageSize > assoc->maximumRecordSize)
- assoc->preferredMessageSize = assoc->maximumRecordSize;
+ if (*req->maximumRecordSize < assoc->maximumRecordSize)
+ assoc->maximumRecordSize = *req->maximumRecordSize;
+
+ if (*req->preferredMessageSize < assoc->preferredMessageSize)
+ assoc->preferredMessageSize = *req->preferredMessageSize;
resp->preferredMessageSize = &assoc->preferredMessageSize;
resp->maximumRecordSize = &assoc->maximumRecordSize;
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.78 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.98 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
form = VAL_NONE;
else
form = prefformat->value;
- resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form, req->referenceId,
- req->preferredRecordSyntax, NULL);
+
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
+ {
+ bend_present_rr *bprr = (bend_present_rr *)
+ nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ bprr->setname = req->resultSetName;
+ bprr->start = 1;
+ bprr->number = *toget;
+ bprr->format = form;
+ bprr->comp = compp;
+ bprr->referenceId = req->referenceId;
+ bprr->stream = assoc->encode;
+ bprr->print = assoc->print;
+ bprr->request = reqb;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ (*assoc->init->bend_present)(assoc->backend, bprr);
+
+ if (!bprr->request)
+ return 0;
+ if (bprr->errcode)
+ {
+ resp->records = diagrec(assoc, bprr->errcode, bprr->errstring);
+ *resp->presentStatus = Z_PresentStatus_failure;
+ }
+ }
+
+ if (!resp->records)
+ resp->records = pack_records(assoc, req->resultSetName, 1,
+ toget, compp, next, presst, form, req->referenceId,
+ req->preferredRecordSyntax, NULL);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
if (log_request)
{
+ int i;
WRBUF wr = wrbuf_alloc();
+
+ for (i = 0 ; i < req->num_databaseNames; i++){
+ if (i)
+ wrbuf_printf(wr, "+");
+ wrbuf_printf(wr, req->databaseNames[i]);
+ }
+ wrbuf_printf(wr, " ");
+
if (bsrt->errcode)
wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
else
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 -");
+ wrbuf_printf(wr, "OK - ");
else
- wrbuf_printf(wr, "Partial %d", *resp->presentStatus);
+ wrbuf_printf(wr, "Partial %d - ", *resp->presentStatus);
wrbuf_printf(wr, " %s %d+%d ",
req->resultSetId, *req->resultSetStartPoint,
}
if (log_request)
{
+ int i;
WRBUF wr = wrbuf_alloc();
- if (bsrr->errcode)
+ wrbuf_printf(wr, "Scan ");
+ for (i = 0 ; i < req->num_databaseNames; i++){
+ if (i)
+ wrbuf_printf(wr, "+");
+ wrbuf_printf(wr, req->databaseNames[i]);
+ }
+ wrbuf_printf(wr, " ");
+
+ if (bsrr->errcode){
wr_diag(wr, bsrr->errcode, bsrr->errstring);
- else if (*res->scanStatus == Z_Scan_success)
- wrbuf_printf(wr, "OK");
+ wrbuf_printf(wr, " ");
+ }
+ else
+ wrbuf_printf(wr, "OK ");
+ /* else if (*res->scanStatus == Z_Scan_success) */
+ /* wrbuf_printf(wr, "OK "); */
+ /* else */
+ /* wrbuf_printf(wr, "Partial "); */
+
+ if (*res->numberOfEntriesReturned)
+ wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned);
else
- wrbuf_printf(wr, "Partial");
+ wrbuf_printf(wr, "0 - ");
- wrbuf_printf(wr, " %d+%d %d ",
+ wrbuf_printf(wr, "%d+%d+%d ",
(req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1),
*req->numberOfTermsRequested,
- (res->stepSize ? *res->stepSize : 0));
+ (res->stepSize ? *res->stepSize : 1));
+
yaz_scan_to_wrbuf(wr, req->termListAndStartPoint,
bsrr->attributeset);
- yaz_log(log_request, "Scan %s", wrbuf_buf(wr) );
+ yaz_log(log_request, "%s", wrbuf_buf(wr) );
wrbuf_free(wr, 1);
}
return apdu;
for (i = 0; i<req->num_inputResultSetNames; i++)
{
if (i)
- wrbuf_printf(wr, ",");
+ wrbuf_printf(wr, "+");
wrbuf_printf(wr, req->inputResultSetNames[i]);
}
wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
projects / yaz-moved-to-github.git / blobdiff