/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.81 2006-05-13 03:56:31 quinn Exp $
+ * $Id: seshigh.c,v 1.108 2007-01-03 08:42:15 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 */
/** get_logbits sets global loglevel bits */
-static void get_logbits()
+static void get_logbits(void)
{ /* needs to be called after parsing cmd-line args that can set loglevels!*/
if (!logbits_set)
{
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, " ");
}
do_close_req (a, reason, message, req);
}
+
+int ir_read(IOCHAN h, int event)
+{
+ association *assoc = (association *)iochan_getdata(h);
+ COMSTACK conn = assoc->client_link;
+ request *req;
+
+ if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
+ {
+ yaz_log(YLOG_DEBUG, "ir_session (input)");
+ /* We aren't speaking to this fellow */
+ if (assoc->state == ASSOC_DEAD)
+ {
+ yaz_log(log_sessiondetail, "Connection closed - end of session");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ return 0;
+ }
+ assoc->cs_get_mask = EVENT_INPUT;
+
+ do
+ {
+ int res = cs_get(conn, &assoc->input_buffer,
+ &assoc->input_buffer_len);
+ if (res < 0 && cs_errno(conn) == CSBUFSIZE)
+ {
+ 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 0;
+ }
+ else if (res <= 0)
+ {
+ yaz_log(log_session, "Connection closed by client");
+ assoc->state = ASSOC_DEAD;
+ return 0;
+ }
+ else if (res == 1) /* incomplete read - wait for more */
+ {
+ if (conn->io_pending & CS_WANT_WRITE)
+ assoc->cs_get_mask |= EVENT_OUTPUT;
+ iochan_setflag(h, assoc->cs_get_mask);
+ return 0;
+ }
+ /* we got a complete PDU. Let's decode it */
+ yaz_log(YLOG_DEBUG, "Got PDU, %d bytes: lead=%02X %02X %02X", res,
+ assoc->input_buffer[0] & 0xff,
+ assoc->input_buffer[1] & 0xff,
+ assoc->input_buffer[2] & 0xff);
+ req = request_get(&assoc->incoming); /* get a new request */
+ odr_reset(assoc->decode);
+ odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
+ if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
+ {
+ yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] "
+ "[near byte %ld] ",
+ odr_errmsg(odr_geterror(assoc->decode)),
+ odr_getelement(assoc->decode),
+ (long) odr_offset(assoc->decode));
+ if (assoc->decode->error != OHTTP)
+ {
+ 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");
+ }
+ else
+ {
+ Z_GDU *p = z_get_HTTP_Response(assoc->encode, 400);
+ assoc->state = ASSOC_DEAD;
+ process_gdu_response(assoc, req, p);
+ }
+ return 0;
+ }
+ req->request_mem = odr_extract_mem(assoc->decode);
+ if (assoc->print)
+ {
+ if (!z_GDU(assoc->print, &req->gdu_request, 0, 0))
+ yaz_log(YLOG_WARN, "ODR print error: %s",
+ odr_errmsg(odr_geterror(assoc->print)));
+ odr_reset(assoc->print);
+ }
+ request_enq(&assoc->incoming, req);
+ }
+ while (cs_more(conn));
+ }
+ return 1;
+}
+
/*
* This is where PDUs from the client are read and the further
* processing is initiated. Flow of control moves down through the
}
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;
}
return;
}
- if ((event & assoc->cs_get_mask) || (event & EVENT_WORK)) /* input */
+ if (event & assoc->cs_get_mask) /* input */
{
- if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
- {
- yaz_log(YLOG_DEBUG, "ir_session (input)");
- /* We aren't speaking to this fellow */
- if (assoc->state == ASSOC_DEAD)
- {
- yaz_log(log_session, "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)
- {
- yaz_log(log_session, "Connection closed by client");
- cs_close(conn);
- destroy_association(assoc);
- iochan_destroy(h);
- return;
- }
- else if (res == 1) /* incomplete read - wait for more */
- {
- if (conn->io_pending & CS_WANT_WRITE)
- assoc->cs_get_mask |= EVENT_OUTPUT;
- iochan_setflag(h, assoc->cs_get_mask);
- return;
- }
- if (cs_more(conn)) /* more stuff - call us again later, please */
- iochan_setevent(h, EVENT_INPUT);
-
- /* we got a complete PDU. Let's decode it */
- yaz_log(YLOG_DEBUG, "Got PDU, %d bytes: lead=%02X %02X %02X", res,
- assoc->input_buffer[0] & 0xff,
- assoc->input_buffer[1] & 0xff,
- assoc->input_buffer[2] & 0xff);
- req = request_get(&assoc->incoming); /* get a new request */
- odr_reset(assoc->decode);
- odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
- if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
- {
- yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] "
- "[near byte %ld] ",
- odr_errmsg(odr_geterror(assoc->decode)),
- odr_getelement(assoc->decode),
- (long) odr_offset(assoc->decode));
- if (assoc->decode->error != OHTTP)
- {
- 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");
- }
- else
- {
- Z_GDU *p = z_get_HTTP_Response(assoc->encode, 400);
- assoc->state = ASSOC_DEAD;
- process_gdu_response(assoc, req, p);
- }
- return;
- }
- req->request_mem = odr_extract_mem(assoc->decode);
- if (assoc->print)
- {
- if (!z_GDU(assoc->print, &req->gdu_request, 0, 0))
- yaz_log(YLOG_WARN, "ODR print error: %s",
- odr_errmsg(odr_geterror(assoc->print)));
- odr_reset(assoc->print);
- }
- request_enq(&assoc->incoming, req);
- }
-
- /* can we do something yet? */
+ if (!ir_read(h, event))
+ return;
req = request_head(&assoc->incoming);
if (req->state == REQUEST_IDLE)
{
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));
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
+#if YAZ_HAVE_XML2
yaz_record_conv_t rc = 0;
const char *match_schema = 0;
int *match_syntax = 0;
- if (!assoc->server)
- {
- yaz_log(YLOG_LOG, "no assoc->server");
- }
if (assoc->server)
{
int r;
- const char *input_schema = get_esn(rr->comp);
+ const char *input_schema = yaz_get_esn(rr->comp);
Odr_oid *input_syntax_raw = rr->request_format_raw;
const char *backend_schema = 0;
Odr_oid *backend_syntax = 0;
- yaz_log(YLOG_LOG, "found assoc->server");
-
r = yaz_retrieval_request(assoc->server->retrieval,
input_schema,
input_syntax_raw,
&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(
}
if (backend_schema)
{
- set_esn(&rr->comp, backend_schema, rr->stream->mem);
+ yaz_set_esn(&rr->comp, backend_schema, rr->stream->mem);
}
if (backend_syntax)
{
rr->output_format = oi ? oi->value : VAL_NONE;
rr->output_format_raw = match_syntax;
}
- yaz_log(YLOG_LOG, "match_scheam=%s", match_schema);
if (match_schema)
rr->schema = odr_strdup(rr->stream, match_schema);
return 0;
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;
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,
srw_res->resultSetIdleTime =
odr_intdup(assoc->encode, *rr.srw_setnameIdleTime );
}
- if (number > 0)
+
+ if ((rr.hits > 0 && start > rr.hits) || start < 1)
+ {
+ yaz_add_srw_diagnostic(
+ assoc->encode,
+ &srw_res->diagnostics, &srw_res->num_diagnostics,
+ YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0);
+ }
+ else if (number > 0)
{
int i;
+ int ok = 1;
+ if (start + number > rr.hits)
+ number = rr.hits - start + 1;
- if (start > rr.hits)
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
{
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0);
+ 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);
+
+ 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,
+ srw_error, bprr->errstring);
+ ok = 0;
+ }
}
- else
+
+ if (ok)
{
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;
+ if (srw_req->recordPacking)
+ {
+ packing =
+ yaz_srw_str_to_pack(srw_req->recordPacking);
+ if (packing == -1)
+ packing = Z_SRW_recordPacking_string;
}
srw_res->records = (Z_SRW_record *)
odr_malloc(assoc->encode,
for (i = 0; i<number; i++)
{
int errcode;
+ const char *addinfo = 0;
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);
+ 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),
- rr.errstring);
+ addinfo);
break;
}
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;
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;
+ packing =
+ yaz_srw_str_to_pack(srw_req->recordPacking);
+ if (packing == -1)
+ packing = Z_SRW_recordPacking_string;
}
srw_res->record.recordSchema = rr.schema;
srw_res->record.recordPacking = packing;
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);
}
int *http_code)
{
Z_SRW_updateRequest *srw_req = sr->u.update_request;
- yaz_log(YLOG_DEBUG, "Got SRW UpdateRequest");
+ yaz_log(log_session, "SRWUpdate action=%s", srw_req->operation);
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;
+ Z_SRW_extra_record *extra = srw_req->extra_record;
rr.stream = assoc->encode;
rr.print = assoc->print;
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_versions = 0;
+ rr.num_versions = 0;
+ rr.record_packing = "string";
rr.record_schema = 0;
rr.record_data = 0;
- rr.request_extra_record = 0;
- rr.response_extra_record = 0;
+ rr.extra_record_data = 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;
+
+ *http_code = 200;
+ if (rr.operation == 0)
+ {
+ yaz_add_sru_update_diagnostic(
+ assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED,
+ "action" );
+ return;
+ }
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 (!strcmp( rr.operation, "delete"))
+ {
+ if (srw_req->record && !srw_req->record->recordSchema)
+ {
+ rr.record_schema = odr_strdup(
+ assoc->encode,
+ srw_req->record->recordSchema);
}
- if ( srw_req->recordOldVersion ){
- rr.record_old_version = odr_strdup(assoc->encode,
- srw_req->recordOldVersion );
+ if (srw_req->record)
+ {
+ rr.record_data = odr_strdupn(
+ assoc->encode,
+ srw_req->record->recordData_buf,
+ srw_req->record->recordData_len );
}
- if ( srw_req->extraRequestData ){
- rr.extra_request_data = odr_strdup(assoc->encode,
- srw_req->extraRequestData );
+ if (extra && extra->extraRecordData_len)
+ {
+ rr.extra_record_data = odr_strdupn(
+ assoc->encode,
+ extra->extraRecordData_buf,
+ extra->extraRecordData_len );
}
+ if (srw_req->recordId)
+ rr.record_id = srw_req->recordId;
+ else if (extra && extra->recordIdentifier)
+ rr.record_id = extra->recordIdentifier;
}
- 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 {
+ else if (!strcmp(rr.operation, "replace"))
+ {
+ if (srw_req->recordId)
rr.record_id = srw_req->recordId;
+ else if (extra && extra->recordIdentifier)
+ rr.record_id = extra->recordIdentifier;
+ else
+ {
+ yaz_add_sru_update_diagnostic(
+ assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED,
+ "recordIdentifier");
}
- 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)
+ if (!srw_req->record)
{
- 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;
+ yaz_add_sru_update_diagnostic(
+ assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED,
+ "record");
}
- 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
+ {
+ if (srw_req->record->recordSchema)
+ rr.record_schema = odr_strdup(
+ assoc->encode, srw_req->record->recordSchema);
+ if (srw_req->record->recordData_len )
+ {
+ rr.record_data = odr_strdupn(assoc->encode,
+ srw_req->record->recordData_buf,
+ srw_req->record->recordData_len );
+ }
+ else
+ {
+ yaz_add_sru_update_diagnostic(
+ assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED,
+ "recordData" );
+ }
}
- else {
- yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 7, "recordData" );
+ if (extra && extra->extraRecordData_len)
+ {
+ rr.extra_record_data = odr_strdupn(
+ assoc->encode,
+ extra->extraRecordData_buf,
+ extra->extraRecordData_len );
}
- if (srw_req->extraRequestData)
- rr.extra_request_data = odr_strdup(assoc->encode,
- srw_req->extraRequestData );
}
- else if ( !strcmp( rr.operation, "insert" ) )
+ 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)
+ if (srw_req->recordId)
+ rr.record_id = srw_req->recordId;
+ else if (extra)
+ rr.record_id = extra->recordIdentifier;
+
+ if (srw_req->record)
{
- 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->recordSchema)
+ rr.record_schema = odr_strdup(
+ assoc->encode, srw_req->record->recordSchema);
- if (srw_req->record.recordData_len)
+ if (srw_req->record->recordData_len)
+ rr.record_data = odr_strdupn(
+ assoc->encode,
+ srw_req->record->recordData_buf,
+ srw_req->record->recordData_len );
+ }
+ if (extra && extra->extraRecordData_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;
+ rr.extra_record_data = odr_strdupn(
+ assoc->encode,
+ extra->extraRecordData_buf,
+ extra->extraRecordData_len );
}
- 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
+ yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_INVALID_ACTION,
+ rr.operation );
+
+ if (srw_req->record)
+ {
+ const char *pack_str =
+ yaz_srw_pack_to_str(srw_req->record->recordPacking);
+ if (pack_str)
+ rr.record_packing = odr_strdup(assoc->encode, pack_str);
+ }
+
+ if (srw_req->num_recordVersions)
+ {
+ rr.record_versions = srw_req->recordVersions;
+ rr.num_versions = srw_req->num_recordVersions;
+ }
+ if (srw_req->extraRequestData_len)
+ {
+ rr.extra_request_data = odr_strdupn(assoc->encode,
+ srw_req->extraRequestData_buf,
+ srw_req->extraRequestData_len );
+ }
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;
- }
+ else
+ yaz_add_sru_update_diagnostic(
+ assoc->encode, &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRU_UPDATE_UNSPECIFIED_DATABASE_ERROR,
+ "No Update backend handler");
}
- 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;
- srw_res->recordChecksum = rr.record_checksum;
- srw_res->extraResponseData = rr.extra_response_data;
- srw_res->record.recordPosition = 0;
+ srw_res->recordVersions = rr.record_versions;
+ srw_res->num_recordVersions = rr.num_versions;
+ if (srw_res->extraResponseData_len)
+ {
+ srw_res->extraResponseData_buf = rr.extra_response_data;
+ srw_res->extraResponseData_len = strlen(rr.extra_response_data);
+ }
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;
+ {
+ srw_res->record = yaz_srw_get_record(assoc->encode);
+ srw_res->record->recordSchema = rr.record_schema;
+ if (rr.record_packing)
+ {
+ int pack = yaz_srw_str_to_pack(rr.record_packing);
+
+ if (pack == -1)
+ {
+ pack = Z_SRW_recordPacking_string;
+ yaz_log(YLOG_WARN, "Back packing %s from backend",
+ rr.record_packing);
+ }
+ srw_res->record->recordPacking = pack;
+ }
+ srw_res->record->recordData_buf = rr.record_data;
+ srw_res->record->recordData_len = strlen(rr.record_data);
+ if (rr.extra_record_data)
+ {
+ Z_SRW_extra_record *ex =
+ yaz_srw_get_extra_record(assoc->encode);
+ srw_res->extra_record = ex;
+ ex->extraRecordData_buf = rr.extra_record_data;
+ ex->extraRecordData_len = strlen(rr.extra_record_data);
+ }
+ }
}
}
if (http_code == 200 || http_code == 500)
{
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},
+#if YAZ_HAVE_XML2
+ {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_SRU_v1_0, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
#endif
{0, 0, 0}
};
iochan_setflag(assoc->client_chan, EVENT_OUTPUT);
assoc->cs_put_mask = EVENT_OUTPUT;
/* Is there more work to be done? give that to the input handler too */
-#if 1
- if (request_head(&assoc->incoming))
+ for (;;)
{
- yaz_log (YLOG_DEBUG, "more work to be done");
- iochan_setevent(assoc->client_chan, EVENT_WORK);
+ req = request_head(&assoc->incoming);
+ if (req && req->state == REQUEST_IDLE)
+ {
+ request_deq(&assoc->incoming);
+ process_gdu_request(assoc, req);
+ }
+ else
+ break;
}
-#endif
return 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.81 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.108 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
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, "Partial");
+ 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, "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);
return apdu;
}
+int bend_assoc_is_alive(bend_association assoc)
+{
+ if (assoc->state == ASSOC_DEAD)
+ return 0; /* already marked as dead. Don't check I/O chan anymore */
+
+ return iochan_is_alive(assoc->client_chan);
+}
+
+
/*
* Local variables:
* c-basic-offset: 4