/*
- * 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.103 2006-10-27 11:22:09 adam Exp $
+ * $Id: seshigh.c,v 1.121 2007-05-30 21:56:59 adam Exp $
*/
/**
* \file seshigh.c
#include "session.h"
#include "mime.h"
#include <yaz/proto.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <yaz/log.h>
#include <yaz/logrpn.h>
#include <yaz/querytowrbuf.h>
#include <yaz/otherinfo.h>
#include <yaz/yaz-util.h>
#include <yaz/pquery.h>
+#include <yaz/oid_db.h>
#include <yaz/srw.h>
#include <yaz/backend.h>
do_close_req (a, reason, message, req);
}
-/*
- * This is where PDUs from the client are read and the further
- * processing is initiated. Flow of control moves down through the
- * various process_* functions below, until the encoded result comes back up
- * to the output handler in here.
- *
- * h : the I/O channel that has an outstanding event.
- * event : the current outstanding event.
- */
-void ir_session(IOCHAN h, int event)
+
+int ir_read(IOCHAN h, int event)
{
- int res;
association *assoc = (association *)iochan_getdata(h);
COMSTACK conn = assoc->client_link;
request *req;
-
- assert(h && conn && assoc);
- if (event == EVENT_TIMEOUT)
+
+ if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
{
- if (assoc->state != ASSOC_UP)
+ yaz_log(YLOG_DEBUG, "ir_session (input)");
+ /* We aren't speaking to this fellow */
+ if (assoc->state == ASSOC_DEAD)
{
- yaz_log(YLOG_DEBUG, "Final timeout - closing connection.");
- /* do we need to lod this at all */
+ yaz_log(log_sessiondetail, "Connection closed - end of session");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
+ return 0;
}
- else
- {
- yaz_log(log_sessiondetail,
- "Session idle too long. Sending close.");
- do_close(assoc, Z_Close_lackOfActivity, 0);
- }
- return;
- }
- if (event & assoc->cs_accept_mask)
- {
- if (!cs_accept (conn))
- {
- yaz_log (YLOG_WARN, "accept failed");
- destroy_association(assoc);
- iochan_destroy(h);
- }
- iochan_clearflag (h, EVENT_OUTPUT);
- if (conn->io_pending)
- { /* cs_accept didn't complete */
- assoc->cs_accept_mask =
- ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
- ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0);
+ assoc->cs_get_mask = EVENT_INPUT;
- iochan_setflag (h, assoc->cs_accept_mask);
- }
- else
- { /* cs_accept completed. Prepare for reading (cs_get) */
- assoc->cs_accept_mask = 0;
- assoc->cs_get_mask = EVENT_INPUT;
- iochan_setflag (h, assoc->cs_get_mask);
- }
- return;
- }
- if ((event & assoc->cs_get_mask) || (event & EVENT_WORK)) /* input */
- {
- if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
+ do
{
- 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;
- }
- assoc->cs_get_mask = EVENT_INPUT;
- res = cs_get(conn, &assoc->input_buffer,
- &assoc->input_buffer_len);
+ 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",
req = request_get(&assoc->incoming); /* get a new request */
do_close_req(assoc, Z_Close_protocolError,
"Incoming package too large", req);
- return;
+ return 0;
}
else if (res <= 0)
{
- yaz_log(log_sessiondetail, "Connection closed by client");
- cs_close(conn);
- destroy_association(assoc);
- iochan_destroy(h);
- return;
+ 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;
+ return 0;
}
- 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);
+ 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);
assoc->state = ASSOC_DEAD;
process_gdu_response(assoc, req, p);
}
- return;
+ 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_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
+ * various process_* functions below, until the encoded result comes back up
+ * to the output handler in here.
+ *
+ * h : the I/O channel that has an outstanding event.
+ * event : the current outstanding event.
+ */
+void ir_session(IOCHAN h, int event)
+{
+ int res;
+ association *assoc = (association *)iochan_getdata(h);
+ COMSTACK conn = assoc->client_link;
+ request *req;
+
+ assert(h && conn && assoc);
+ if (event == EVENT_TIMEOUT)
+ {
+ if (assoc->state != ASSOC_UP)
+ {
+ yaz_log(YLOG_DEBUG, "Final timeout - closing connection.");
+ /* do we need to lod this at all */
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ }
+ else
+ {
+ yaz_log(log_sessiondetail,
+ "Session idle too long. Sending close.");
+ do_close(assoc, Z_Close_lackOfActivity, 0);
+ }
+ return;
+ }
+ if (event & assoc->cs_accept_mask)
+ {
+ if (!cs_accept (conn))
+ {
+ yaz_log (YLOG_WARN, "accept failed");
+ destroy_association(assoc);
+ iochan_destroy(h);
+ }
+ iochan_clearflag (h, EVENT_OUTPUT);
+ if (conn->io_pending)
+ { /* cs_accept didn't complete */
+ assoc->cs_accept_mask =
+ ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
+ ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0);
- /* can we do something yet? */
+ iochan_setflag (h, assoc->cs_accept_mask);
+ }
+ else
+ { /* cs_accept completed. Prepare for reading (cs_get) */
+ assoc->cs_accept_mask = 0;
+ assoc->cs_get_mask = EVENT_INPUT;
+ iochan_setflag (h, assoc->cs_get_mask);
+ }
+ return;
+ }
+ if (event & assoc->cs_get_mask) /* input */
+ {
+ if (!ir_read(h, event))
+ return;
req = request_head(&assoc->incoming);
if (req->state == REQUEST_IDLE)
{
assoc->init->implementation_version = 0;
assoc->init->implementation_id = 0;
assoc->init->implementation_name = 0;
+ assoc->init->query_charset = 0;
+ assoc->init->records_in_same_charset = 0;
assoc->init->bend_sort = NULL;
assoc->init->bend_search = NULL;
assoc->init->bend_present = NULL;
if (sr->username)
{
- Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth));
+ Z_IdAuthentication *auth = (Z_IdAuthentication *)
+ 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);
+ auth->u.open = (char *) odr_malloc(assoc->decode, len);
strcpy(auth->u.open, sr->username);
if (sr->password && *sr->password)
{
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 YAZ_HAVE_XML2
yaz_record_conv_t rc = 0;
const char *match_schema = 0;
- int *match_syntax = 0;
+ Odr_oid *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 *input_schema = yaz_get_esn(rr->comp);
+ Odr_oid *input_syntax_raw = rr->request_format;
const char *backend_schema = 0;
Odr_oid *backend_syntax = 0;
else if (r == 1 || r == 3)
{
const char *details = input_schema;
- rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP;
+ rr->errcode =
+ YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
if (details)
rr->errstring = odr_strdup(rr->stream, details);
return -1;
if (input_syntax_raw)
{
char oidbuf[OID_STR_MAX];
- oid_to_dotstring(input_syntax_raw, oidbuf);
+ oid_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);
+ yaz_set_esn(&rr->comp, backend_schema, odr_getmem(rr->stream));
}
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;
- }
+ rr->request_format = backend_syntax;
}
(*assoc->init->bend_fetch)(assoc->backend, rr);
if (rc && rr->record && rr->errcode == 0 && rr->len > 0)
else
{
rr->len = wrbuf_len(output_record);
- rr->record = odr_malloc(rr->stream, rr->len);
+ rr->record = (char *) odr_malloc(rr->stream, rr->len);
memcpy(rr->record, wrbuf_buf(output_record), rr->len);
}
- wrbuf_free(output_record, 1);
+ wrbuf_destroy(output_record);
}
if (match_syntax)
- {
- struct oident *oi = oid_getentbyoid(match_syntax);
- rr->output_format = oi ? oi->value : VAL_NONE;
- rr->output_format_raw = match_syntax;
- }
+ rr->output_format = match_syntax;
if (match_schema)
rr->schema = odr_strdup(rr->stream, match_schema);
return 0;
#else
(*assoc->init->bend_fetch)(assoc->backend, rr);
#endif
+ return 0;
}
static int srw_bend_fetch(association *assoc, int pos,
rr.setname = "default";
rr.number = pos;
rr.referenceId = 0;
- rr.request_format = VAL_TEXT_XML;
- rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode,
- CLASS_RECSYN,
- VAL_TEXT_XML);
+ rr.request_format = odr_oiddup(assoc->decode, yaz_oid_recsyn_xml);
+
rr.comp = (Z_RecordComposition *)
odr_malloc(assoc->decode, sizeof(*rr.comp));
rr.comp->which = Z_RecordComp_complex;
if (rr.errstring)
len += strlen(rr.errstring);
- record->recordData_buf = odr_malloc(o, len);
+ record->recordData_buf = (char *) odr_malloc(o, len);
sprintf(record->recordData_buf, "<diagnostic "
"xmlns=\"http://www.loc.gov/zing/srw/diagnostic/\">\n"
rr.srw_sortKeys = 0;
rr.srw_setname = 0;
rr.srw_setnameIdleTime = 0;
+ rr.estimated_hit_count = 0;
+ rr.partial_resultset = 0;
rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
rr.query->u.type_1 = 0;
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,
{
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;
+ 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,
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 = 0;
}
}
+ if (rr.estimated_hit_count || rr.partial_resultset)
+ {
+ yaz_add_srw_diagnostic(
+ assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ YAZ_SRW_RESULT_SET_CREATED_WITH_VALID_PARTIAL_RESULTS_AVAILABLE,
+ 0);
+ }
}
}
}
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);
+ yaz_log(log_request, "%s %s: %s", wrbuf_cstr(wr), querytype, querystr);
+ wrbuf_destroy(wr);
}
}
static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
{
#if YAZ_HAVE_XML2
- xmlNodePtr ptr = rr->server_node_ptr;
+ xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr;
if (!ptr)
return 0;
for (ptr = ptr->children; ptr; ptr = ptr->next)
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;
bsrr->print = assoc->print;
bsrr->step_size = odr_intdup(assoc->decode, 0);
bsrr->entries = 0;
+ bsrr->setname = 0;
if (bsrr->num_entries > 0)
{
int i;
- bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
- bsrr->num_entries);
+ bsrr->entries = (struct scan_entry *)
+ odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+ bsrr->num_entries);
for (i = 0; i<bsrr->num_entries; i++)
{
bsrr->entries[i].term = 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,
+ &bsrr->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 *))
{
int srw_error;
bsrr->scanClause = 0;
- bsrr->attributeset = VAL_NONE;
- bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
+ bsrr->attributeset = 0;
+ bsrr->term = (Z_AttributesPlusTerm *)
+ odr_malloc(assoc->decode, sizeof(*bsrr->term));
srw_error = cql2pqf_scan(assoc->encode,
srw_req->scanClause.cql,
assoc->server->cql_transform,
&& assoc->init->bend_srw_scan)
{
bsrr->term = 0;
- bsrr->attributeset = VAL_NONE;
+ bsrr->attributeset = 0;
bsrr->scanClause = srw_req->scanClause.cql;
((int (*)(void *, bend_scan_rr *))
(*assoc->init->bend_srw_scan))(assoc->backend, bsrr);
*srw_req->maximumTerms : 1));
/* 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);
+ yaz_log(log_request, "%s ", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
}
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.uri = 0;
rr.message = 0;
rr.details = 0;
- if ( rr.operation == 0 ){
- yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "action" );
+ *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 ){
- if ( srw_req->record.recordData_len ){
- if ( srw_req->record.recordSchema == 0 ){
- yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "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;
- }
- 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_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "recordIdentifier OR recordData" );
- }
- }
- else {
- rr.record_id = srw_req->recordId;
- if ( srw_req->record.recordData_len ){
- yaz_add_sru_update_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "recordData" );
- }
- }
- if ( srw_req->recordVersion ){
- 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_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "recordIdentifier" );
- }
- 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_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "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_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "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" ) ) {
- rr.record_id = srw_req->recordId;
- if ( srw_req->record.recordSchema == 0 ){
- yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "recordSchema" );
- }
- else {
- rr.record_schema = odr_strdup(assoc->encode,
- srw_req->record.recordSchema);
- }
- switch (srw_req->record.recordPacking)
+ else if (!strcmp(rr.operation, "insert"))
+ {
+ 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_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- 9, "recordData" );
- if ( srw_req->extraRequestData )
- rr.extra_request_data = odr_strdup(assoc->encode,
- srw_req->extraRequestData );
}
- else {
+ else
yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics,
&srw_res->num_diagnostics,
- 100, rr.operation );
+ 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.uri)
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);
+ }
+ }
}
}
fseek(inf, 0L, SEEK_END);
*sz = ftell(inf);
rewind(inf);
- buf = odr_malloc(o, *sz);
+ buf = (char *) odr_malloc(o, *sz);
fread(buf, 1, *sz, inf);
fclose(inf);
return buf;
{
static Z_SOAP_Handler soap_handlers[4] = {
#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,
- (Z_SOAP_fun) yaz_srw_codec},
- {"http://www.loc.gov/zing/srw/update/", 0,
- (Z_SOAP_fun) yaz_ucp_codec},
+ {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;
}
static char *get_vhost(Z_OtherInformation *otherInfo)
{
- return yaz_oi_get_string_oidval(&otherInfo, VAL_PROXY, 1, 0);
+ return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0);
}
/*
else
{
/* no backend. return error */
- binitres = odr_malloc(assoc->encode, sizeof(*binitres));
+ binitres = (bend_initresult *)
+ odr_malloc(assoc->encode, sizeof(*binitres));
binitres->errstring = 0;
binitres->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR;
iochan_settimeout(assoc->client_chan, 10);
ODR_MASK_SET(resp->options, Z_Options_sort);
strcat(options, " sort");
}
-
- if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)
- && assoc->init->charneg_response)
+
+ if (ODR_MASK_GET(req->options, Z_Options_negotiationModel))
{
- Z_OtherInformation **p;
Z_OtherInformationUnit *p0;
-
- yaz_oi_APDU(apdu, &p);
-
- if ((p0=yaz_oi_update(p, assoc->encode, NULL, 0, 0))) {
- ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
-
+
+ if (!assoc->init->charneg_response)
+ {
+ if (assoc->init->query_charset)
+ {
+ assoc->init->charneg_response = yaz_set_response_charneg(
+ assoc->encode, assoc->init->query_charset, 0,
+ assoc->init->records_in_same_charset);
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "default query_charset not defined by backend");
+ }
+ }
+ if (assoc->init->charneg_response
+ && (p0=yaz_oi_update(&resp->otherInfo, assoc->encode, NULL, 0, 0)))
+ {
p0->which = Z_OtherInfo_externallyDefinedInfo;
p0->information.externallyDefinedInfo =
assoc->init->charneg_response;
+ ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
+ strcat(options, " negotiation");
}
- ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
- strcat(options, " negotiation");
}
-
if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.103 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.121 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
(req->implementationVersion ?
req->implementationVersion : "-")
);
- yaz_log(log_request, "%s", wrbuf_buf(wr));
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr));
+ wrbuf_destroy(wr);
}
return apdu;
}
static Z_Records *pack_records(association *a, char *setname, int start,
int *num, Z_RecordComposition *comp,
- int *next, int *pres, oid_value format,
+ int *next, int *pres,
Z_ReferenceId *referenceId,
- int *oid, int *errcode)
+ Odr_oid *oid, int *errcode)
{
int recno, total_length = 0, toget = *num, dumped_records = 0;
Z_Records *records =
freq.surrogate_flag = 0;
freq.number = recno;
freq.comp = comp;
- freq.request_format = format;
- freq.request_format_raw = oid;
- freq.output_format = format;
- freq.output_format_raw = 0;
+ freq.request_format = oid;
+ freq.output_format = 0;
freq.stream = a->encode;
freq.print = a->print;
freq.referenceId = referenceId;
thisrec->databaseName = 0;
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (freq.output_format_raw)
- {
- struct oident *ident = oid_getentbyoid(freq.output_format_raw);
- freq.output_format = ident->value;
- }
- thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format,
- freq.record, freq.len);
+ if (!freq.output_format)
+ freq.output_format = freq.request_format;
+ thisrec->u.databaseRecord = z_ext_record_oid(
+ a->encode, freq.output_format, freq.record, freq.len);
if (!thisrec->u.databaseRecord)
return 0;
reclist->records[reclist->num_records] = thisrec;
bsrr->srw_sortKeys = 0;
bsrr->srw_setname = 0;
bsrr->srw_setnameIdleTime = 0;
+ bsrr->estimated_hit_count = 0;
+ bsrr->partial_resultset = 0;
yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName);
if (req->databaseNames)
{
int i;
for (i = 0; i < req->num_databaseNames; i++)
- yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]);
+ yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]);
}
yaz_log_zquery_level(log_requestdetail,req->query);
bsrr->basenames = req->databaseNames;
bsrr->query = req->query;
bsrr->stream = assoc->encode;
- nmem_transfer(bsrr->stream->mem, reqb->request_mem);
+ nmem_transfer(odr_getmem(bsrr->stream), reqb->request_mem);
bsrr->decode = assoc->decode;
bsrr->print = assoc->print;
bsrr->hits = 0;
Z_SearchResponse *resp = (Z_SearchResponse *)
odr_malloc (assoc->encode, sizeof(*resp));
int *nulint = odr_intdup (assoc->encode, 0);
- bool_t *sr = odr_intdup(assoc->encode, 1);
int *next = odr_intdup(assoc->encode, 0);
int *none = odr_intdup(assoc->encode, Z_SearchResponse_none);
- int returnedrecs=0;
+ int returnedrecs = 0;
apdu->which = Z_APDU_searchResponse;
apdu->u.searchResponse = resp;
}
else
{
+ bool_t *sr = odr_intdup(assoc->encode, 1);
int *toget = odr_intdup(assoc->encode, 0);
- int *presst = odr_intdup(assoc->encode, 0);
Z_RecordComposition comp, *compp = 0;
yaz_log (log_requestdetail, "resultCount: %d", bsrt->hits);
if (*toget && !resp->records)
{
- oident *prefformat;
- oid_value form;
-
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
- form = VAL_NONE;
- else
- form = prefformat->value;
-
+ int *presst = odr_intdup(assoc->encode, 0);
/* Call bend_present if defined */
if (assoc->init->bend_present)
{
bprr->setname = req->resultSetName;
bprr->start = 1;
bprr->number = *toget;
- bprr->format = form;
+ bprr->format = req->preferredRecordSyntax;
bprr->comp = compp;
bprr->referenceId = req->referenceId;
bprr->stream = assoc->encode;
}
if (!resp->records)
- resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form, req->referenceId,
- req->preferredRecordSyntax, NULL);
+ resp->records = pack_records(
+ assoc, req->resultSetName, 1,
+ toget, compp, next, presst, req->referenceId,
+ req->preferredRecordSyntax, NULL);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
returnedrecs = *toget;
- resp->nextResultSetPosition = next;
- resp->searchStatus = sr;
- resp->resultSetStatus = 0;
resp->presentStatus = presst;
}
else
if (*resp->resultCount)
*next = 1;
resp->numberOfRecordsReturned = nulint;
- resp->nextResultSetPosition = next;
- resp->searchStatus = sr;
- resp->resultSetStatus = 0;
resp->presentStatus = 0;
}
+ resp->nextResultSetPosition = next;
+ resp->searchStatus = sr;
+ resp->resultSetStatus = 0;
+ if (bsrt->estimated_hit_count)
+ {
+ resp->resultSetStatus = odr_intdup(assoc->encode,
+ Z_SearchResponse_estimate);
+ }
+ else if (bsrt->partial_resultset)
+ {
+ resp->resultSetStatus = odr_intdup(assoc->encode,
+ Z_SearchResponse_subset);
+ }
}
resp->additionalSearchInfo = bsrt->search_info;
req->resultSetName, returnedrecs);
yaz_query_to_wrbuf(wr, req->query);
- yaz_log(log_request, "Search %s", wrbuf_buf(wr));
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "Search %s", wrbuf_cstr(wr));
+ wrbuf_destroy(wr);
}
return apdu;
}
int *fd)
{
Z_PresentRequest *req = reqb->apdu_request->u.presentRequest;
- oident *prefformat;
- oid_value form;
Z_APDU *apdu;
Z_PresentResponse *resp;
int *next;
yaz_log(log_requestdetail, "Got PresentRequest.");
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
- form = VAL_NONE;
- else
- form = prefformat->value;
resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
resp->records = 0;
resp->presentStatus = odr_intdup(assoc->encode, 0);
bprr->setname = req->resultSetId;
bprr->start = *req->resultSetStartPoint;
bprr->number = *req->numberOfRecordsRequested;
- bprr->format = form;
+ bprr->format = req->preferredRecordSyntax;
bprr->comp = req->recordComposition;
bprr->referenceId = req->referenceId;
bprr->stream = assoc->encode;
pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
num, req->recordComposition, next,
resp->presentStatus,
- form, req->referenceId, req->preferredRecordSyntax,
+ req->referenceId, req->preferredRecordSyntax,
&errcode);
}
if (log_request)
wrbuf_printf(wr, " %s %d+%d ",
req->resultSetId, *req->resultSetStartPoint,
*req->numberOfRecordsRequested);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
if (!resp->records)
return 0;
Z_ListEntries *ents = (Z_ListEntries *)
odr_malloc (assoc->encode, sizeof(*ents));
Z_DiagRecs *diagrecs_p = NULL;
- oident *attset;
bend_scan_rr *bsrr = (bend_scan_rr *)
odr_malloc (assoc->encode, sizeof(*bsrr));
struct scan_entry *save_entries;
bsrr->stream = assoc->encode;
bsrr->print = assoc->print;
bsrr->step_size = res->stepSize;
+ bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo,
+ yaz_oid_userinfo_scan_set, 1, 0);
bsrr->entries = 0;
/* For YAZ 2.0 and earlier it was the backend handler that
initialized entries (member display_term did not exist)
if (bsrr->num_entries > 0)
{
int i;
- bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
- bsrr->num_entries);
+ bsrr->entries = (struct scan_entry *)
+ odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+ bsrr->num_entries);
for (i = 0; i<bsrr->num_entries; i++)
{
bsrr->entries[i].term = 0;
}
save_entries = bsrr->entries; /* save it so we can compare later */
- if (req->attributeSet &&
- (attset = oid_getentbyoid(req->attributeSet)) &&
- (attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL))
- bsrr->attributeset = attset->value;
- else
- bsrr->attributeset = VAL_NONE;
+ bsrr->attributeset = req->attributeSet;
log_scan_term_level (log_requestdetail, req->termListAndStartPoint,
bsrr->attributeset);
bsrr->term_position = req->preferredPositionInResponse ?
int i;
WRBUF wr = wrbuf_alloc();
wrbuf_printf(wr, "Scan ");
- for (i = 0 ; i < req->num_databaseNames; i++){
+ 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){
+ if (bsrr->errcode)
wr_diag(wr, bsrr->errcode, bsrr->errstring);
- 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, "0 - ");
+ wrbuf_printf(wr, "OK");
- wrbuf_printf(wr, "%d+%d+%d ",
+ wrbuf_printf(wr, " %d - %d+%d+%d",
+ res->numberOfEntriesReturned ?
+ *res->numberOfEntriesReturned : 0,
(req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1),
*req->numberOfTermsRequested,
(res->stepSize ? *res->stepSize : 1));
+
+ if (bsrr->setname)
+ wrbuf_printf(wr, "+%s", bsrr->setname);
+ wrbuf_printf(wr, " ");
yaz_scan_to_wrbuf(wr, req->termListAndStartPoint,
bsrr->attributeset);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
}
wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
wrbuf_printf(wr, "OK -");
for (i = 0; i<req->num_resultSetList; i++)
wrbuf_printf(wr, " %s ", req->resultSetList[i]);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
{
WRBUF wr = wrbuf_alloc();
wrbuf_diags(wr, resp->num_diagnostics, resp->diagnostics);
- yaz_log(log_request, "EsRequest %s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "EsRequest %s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
}
/* Do something with the members of bend_extendedservice */
if (esrequest.taskPackage)
- resp->taskPackage = z_ext_record (assoc->encode, VAL_EXTENDED,
- (const char *) esrequest.taskPackage,
- -1);
+ {
+ resp->taskPackage = z_ext_record_oid(
+ assoc->encode, yaz_oid_recsyn_extended,
+ (const char *) esrequest.taskPackage, -1
+ );
+ }
yaz_log(YLOG_DEBUG,"Send the result apdu");
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
projects / yaz-moved-to-github.git / blobdiff