/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: seshigh.c,v $
- * Revision 1.54 1995-11-08 15:11:29 quinn
- * Log of close transmit.
- *
- * Revision 1.53 1995/11/01 13:54:58 quinn
- * Minor adjustments
- *
- * Revision 1.52 1995/11/01 12:19:13 quinn
- * Second attempt to fix same bug.
- *
- * Revision 1.50 1995/10/25 16:58:32 quinn
- * Simple.
- *
- * Revision 1.49 1995/10/16 13:51:53 quinn
- * Changes to provide Especs to the backend.
- *
- * Revision 1.48 1995/10/06 08:51:20 quinn
- * Added Write-buffer.
- *
- * Revision 1.47 1995/08/29 14:24:16 quinn
- * Added second half of close-handshake
- *
- * Revision 1.46 1995/08/29 11:17:58 quinn
- * Added code to receive close
- *
- * Revision 1.45 1995/08/21 09:11:00 quinn
- * Smallish fixes to suppport new formats.
- *
- * Revision 1.44 1995/08/17 12:45:25 quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.43 1995/08/15 12:00:31 quinn
- * Updated External
- *
- * Revision 1.42 1995/08/15 11:16:50 quinn
- *
- * Revision 1.41 1995/08/02 10:23:06 quinn
- * Smallish
- *
- * Revision 1.40 1995/07/31 14:34:26 quinn
- * Fixed bug in process_searchResponse (numberOfRecordsReturned).
- *
- * Revision 1.39 1995/06/27 13:21:00 quinn
- * SUTRS support
- *
- * Revision 1.38 1995/06/19 12:39:11 quinn
- * Fixed bug in timeout code. Added BER dumper.
- *
- * Revision 1.37 1995/06/16 13:16:14 quinn
- * Fixed Defaultdiagformat.
- *
- * Revision 1.36 1995/06/16 10:31:36 quinn
- * Added session timeout.
- *
- * Revision 1.35 1995/06/15 07:45:14 quinn
- * Moving to v3.
- *
- * Revision 1.34 1995/06/14 15:26:46 quinn
- * *** empty log message ***
- *
- * Revision 1.33 1995/06/06 14:57:05 quinn
- * Better diagnostics.
- *
- * Revision 1.32 1995/06/06 08:41:44 quinn
- * Better diagnostics.
- *
- * Revision 1.31 1995/06/06 08:15:37 quinn
- * Cosmetic.
- *
- * Revision 1.30 1995/06/05 10:53:32 quinn
- * Added a better SCAN.
- *
- * Revision 1.29 1995/06/01 11:25:03 quinn
- * Smallish.
- *
- * Revision 1.28 1995/06/01 11:21:01 quinn
- * Attempting to fix a bug in pack-records. replaced break with continue
- * for large records, according to standard.
- *
- * Revision 1.27 1995/05/29 08:12:06 quinn
- * Moved oid to util
- *
- * Revision 1.26 1995/05/18 13:02:12 quinn
- * Smallish.
- *
- * Revision 1.25 1995/05/17 08:42:26 quinn
- * Transfer auth info to backend. Allow backend to reject init gracefully.
- *
- * Revision 1.24 1995/05/16 08:51:04 quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.23 1995/05/15 13:25:10 quinn
- * Fixed memory bug.
- *
- * Revision 1.22 1995/05/15 11:56:39 quinn
- * Asynchronous facilities. Restructuring of seshigh code.
- *
- * Revision 1.21 1995/05/02 08:53:19 quinn
- * Trying in vain to fix comm with ISODE
- *
- * Revision 1.20 1995/04/20 15:13:00 quinn
- * Cosmetic
- *
- * Revision 1.19 1995/04/18 08:15:34 quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.18 1995/04/17 11:28:25 quinn
- * Smallish
- *
- * Revision 1.17 1995/04/10 10:23:36 quinn
- * Some work to add scan and other things.
- *
- * Revision 1.16 1995/03/31 09:18:55 quinn
- * Added logging.
- *
- * Revision 1.15 1995/03/30 14:03:23 quinn
- * Added RFC1006 as separate library
- *
- * Revision 1.14 1995/03/30 12:18:17 quinn
- * Fixed bug.
- *
- * Revision 1.13 1995/03/30 09:09:24 quinn
- * Added state-handle and some support for asynchronous activities.
- *
- * Revision 1.12 1995/03/29 15:40:16 quinn
- * Ongoing work. Statserv is now dynamic by default
- *
- * Revision 1.11 1995/03/28 09:16:21 quinn
- * Added record packing to the search request
- *
- * Revision 1.10 1995/03/27 08:34:24 quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.9 1995/03/22 15:01:26 quinn
- * Adjusting record packing.
- *
- * Revision 1.8 1995/03/22 10:13:21 quinn
- * Working on record packer
- *
- * Revision 1.7 1995/03/21 15:53:31 quinn
- * Little changes.
- *
- * Revision 1.6 1995/03/21 12:30:09 quinn
- * Beginning to add support for record packing.
- *
- * Revision 1.5 1995/03/17 10:44:13 quinn
- * Added catch of null-string in makediagrec
- *
- * Revision 1.4 1995/03/17 10:18:08 quinn
- * Added memory management.
- *
- * Revision 1.3 1995/03/16 17:42:39 quinn
- * Little changes
- *
- * Revision 1.2 1995/03/16 13:29:01 quinn
- * Partitioned server.
- *
- * Revision 1.1 1995/03/15 16:02:10 quinn
- * Modded session.c to seshigh.c
*
+ * $Id: seshigh.c,v 1.136 2003-02-17 14:35:42 adam Exp $
*/
/*
* will maintain a pool of buffers for encoding and decoding, trying to
* minimize memory allocation/deallocation during normal operation.
*
- * TODOs include (and will be done in order of public interest):
- *
- * Support for EXPLAIN - provide simple meta-database system.
- * Support for access control.
- * Support for resource control.
- * Support for extended services - primarily Item Order.
- * Rest of Z39.50-1994
- *
*/
#include <stdlib.h>
#include <stdio.h>
+#include <sys/types.h>
+#ifdef WIN32
+#include <io.h>
+#define S_ISREG(x) (x & _S_IFREG)
+#include <process.h>
+#else
+#include <sys/stat.h>
#include <unistd.h>
+#endif
#include <assert.h>
-#include <sys/time.h>
-
-#include <xmalloc.h>
-#include <comstack.h>
-#include <eventl.h>
-#include <session.h>
-#include <proto.h>
-#include <oid.h>
-#include <log.h>
-#include <statserv.h>
-#include <backend.h>
-
-static int process_request(association *assoc);
+#include <yaz/yconfig.h>
+#include <yaz/xmalloc.h>
+#include <yaz/comstack.h>
+#include "eventl.h"
+#include "session.h"
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/logrpn.h>
+#include <yaz/statserv.h>
+#include <yaz/diagbib1.h>
+#include <yaz/charneg.h>
+#include <yaz/otherinfo.h>
+#include <yaz/yaz-util.h>
+
+#include <yaz/srw.h>
+#include <yaz/backend.h>
+
+static void process_gdu_request(association *assoc, request *req);
+static int process_z_request(association *assoc, request *req, char **msg);
void backend_response(IOCHAN i, int event);
-static int process_response(association *assoc, request *req, Z_APDU *res);
+static int process_gdu_response(association *assoc, request *req, Z_GDU *res);
+static int process_z_response(association *assoc, request *req, Z_APDU *res);
static Z_APDU *process_initRequest(association *assoc, request *reqb);
static Z_APDU *process_searchRequest(association *assoc, request *reqb,
int *fd);
static Z_APDU *response_searchRequest(association *assoc, request *reqb,
- bend_searchresult *bsrt, int *fd);
+ bend_search_rr *bsrr, int *fd);
static Z_APDU *process_presentRequest(association *assoc, request *reqb,
int *fd);
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd);
+static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd);
static void process_close(association *assoc, request *reqb);
+void save_referenceId (request *reqb, Z_ReferenceId *refid);
+static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
+ int *fd);
+static Z_APDU *process_segmentRequest (association *assoc, request *reqb);
static FILE *apduf = 0; /* for use in static mode */
static statserv_options_block *control_block = 0;
+static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd);
+
/*
* Create and initialize a new association-handle.
* channel : iochannel for the current line.
*/
association *create_association(IOCHAN channel, COMSTACK link)
{
- association *new;
+ association *anew;
if (!control_block)
control_block = statserv_getcontrol();
- if (!(new = xmalloc(sizeof(*new))))
+ if (!(anew = (association *)xmalloc(sizeof(*anew))))
return 0;
- new->client_chan = channel;
- new->client_link = link;
- if (!(new->decode = odr_createmem(ODR_DECODE)) ||
- !(new->encode = odr_createmem(ODR_ENCODE)))
+ anew->init = 0;
+ anew->client_chan = channel;
+ anew->client_link = link;
+ anew->cs_get_mask = 0;
+ anew->cs_put_mask = 0;
+ anew->cs_accept_mask = 0;
+ if (!(anew->decode = odr_createmem(ODR_DECODE)) ||
+ !(anew->encode = odr_createmem(ODR_ENCODE)))
return 0;
if (*control_block->apdufile)
{
FILE *f;
strcpy(filename, control_block->apdufile);
- if (!(new->print = odr_createmem(ODR_PRINT)))
+ if (!(anew->print = odr_createmem(ODR_PRINT)))
return 0;
- if (*control_block->apdufile != '-')
+ if (*control_block->apdufile == '@')
+ {
+ odr_setprint(anew->print, yaz_log_file());
+ }
+ else if (*control_block->apdufile != '-')
{
strcpy(filename, control_block->apdufile);
if (!control_block->dynamic)
{
if (!(apduf = fopen(filename, "w")))
{
- logf(LOG_WARN|LOG_ERRNO, "%s", filename);
+ yaz_log(LOG_WARN|LOG_ERRNO, "%s", filename);
return 0;
}
setvbuf(apduf, 0, _IONBF, 0);
sprintf(filename + strlen(filename), ".%d", getpid());
if (!(f = fopen(filename, "w")))
{
- logf(LOG_WARN|LOG_ERRNO, "%s", filename);
+ yaz_log(LOG_WARN|LOG_ERRNO, "%s", filename);
return 0;
}
setvbuf(f, 0, _IONBF, 0);
}
- odr_setprint(new->print, f);
+ odr_setprint(anew->print, f);
}
}
else
- new->print = 0;
- new->input_buffer = 0;
- new->input_buffer_len = 0;
- new->backend = 0;
- new->state = ASSOC_NEW;
- request_initq(&new->incoming);
- request_initq(&new->outgoing);
- new->proto = cs_getproto(link);
- return new;
+ anew->print = 0;
+ anew->input_buffer = 0;
+ anew->input_buffer_len = 0;
+ anew->backend = 0;
+ anew->state = ASSOC_NEW;
+ request_initq(&anew->incoming);
+ request_initq(&anew->outgoing);
+ anew->proto = cs_getproto(link);
+ return anew;
}
/*
*/
void destroy_association(association *h)
{
+ statserv_options_block *cb = statserv_getcontrol();
+
+ xfree(h->init);
odr_destroy(h->decode);
odr_destroy(h->encode);
if (h->print)
if (h->input_buffer)
xfree(h->input_buffer);
if (h->backend)
- bend_close(h->backend);
+ (*cb->bend_close)(h->backend);
while (request_deq(&h->incoming));
while (request_deq(&h->outgoing));
- xfree(h);
+ request_delq(&h->incoming);
+ request_delq(&h->outgoing);
+ xfree(h);
+ xmalloc_trav("session closed");
+ if (control_block && control_block->one_shot)
+ exit (0);
}
-static void do_close(association *a, int reason, char *message)
+static void do_close_req(association *a, int reason, char *message,
+ request *req)
{
Z_APDU apdu;
Z_Close *cls = zget_Close(a->encode);
- request *req = request_get();
-
+
/* Purge request queue */
while (request_deq(&a->incoming));
while (request_deq(&a->outgoing));
if (a->version >= 3)
{
- logf(LOG_LOG, "Sending Close PDU, reason=%d, message=%s",
+ yaz_log(LOG_LOG, "Sending Close PDU, reason=%d, message=%s",
reason, message ? message : "none");
apdu.which = Z_APDU_close;
apdu.u.close = cls;
*cls->closeReason = reason;
cls->diagnosticInformation = message;
- process_response(a, req, &apdu);
+ process_z_response(a, req, &apdu);
iochan_settimeout(a->client_chan, 60);
}
else
{
- logf(LOG_DEBUG, "v2 client. No Close PDU");
+ yaz_log(LOG_DEBUG, "v2 client. No Close PDU");
iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */
}
a->state = ASSOC_DEAD;
}
+static void do_close(association *a, int reason, char *message)
+{
+ do_close_req (a, reason, message, request_get(&a->outgoing));
+}
+
/*
* This is where PDUs from the client are read and the further
* processing is initiated. Flow of control moves down through the
void ir_session(IOCHAN h, int event)
{
int res;
- association *assoc = iochan_getdata(h);
+ association *assoc = (association *)iochan_getdata(h);
COMSTACK conn = assoc->client_link;
request *req;
{
if (assoc->state != ASSOC_UP)
{
- logf(LOG_LOG, "Final timeout - closing connection.");
+ yaz_log(LOG_LOG, "Final timeout - closing connection.");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
}
else
{
- logf(LOG_LOG, "Session idle too long. Sending close.");
+ yaz_log(LOG_LOG, "Session idle too long. Sending close.");
do_close(assoc, Z_Close_lackOfActivity, 0);
}
return;
}
- if (event & EVENT_INPUT || event & EVENT_WORK) /* input */
+ if (event & assoc->cs_accept_mask)
+ {
+ yaz_log (LOG_DEBUG, "ir_session (accept)");
+ if (!cs_accept (conn))
+ {
+ yaz_log (LOG_LOG, "accept failed");
+ destroy_association(assoc);
+ iochan_destroy(h);
+ }
+ iochan_clearflag (h, EVENT_OUTPUT|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);
+
+ 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 (event & EVENT_INPUT)
+ if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
{
- logf(LOG_DEBUG, "ir_session (input)");
- assert(assoc && conn);
+ yaz_log(LOG_DEBUG, "ir_session (input)");
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
- logf(LOG_LOG, "Closed connection after reject");
+ yaz_log(LOG_LOG, "Closed connection after reject");
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)
{
- logf(LOG_LOG, "Connection closed by client");
+ yaz_log(LOG_LOG, "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 */
- logf(LOG_DEBUG, "Got PDU, %d bytes", res);
- req = request_get(); /* get a new request structure */
+ yaz_log(LOG_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 structure */
odr_reset(assoc->decode);
odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
- if (!z_APDU(assoc->decode, &req->request, 0))
+ if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
- logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
- odr_errlist[odr_geterror(assoc->decode)],
- odr_offset(assoc->decode));
- logf(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(), assoc->input_buffer, res);
- do_close(assoc, Z_Close_protocolError, "Malformed package");
+ yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+ odr_errmsg(odr_geterror(assoc->decode)),
+ odr_offset(assoc->decode));
+ if (assoc->decode->error != OHTTP)
+ {
+ yaz_log(LOG_LOG, "PDU dump:");
+ odr_dumpBER(yaz_log_file(), assoc->input_buffer, res);
+ 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 && !z_APDU(assoc->print, &req->request, 0))
+ if (assoc->print && !z_GDU(assoc->print, &req->gdu_request, 0, 0))
{
- logf(LOG_WARN, "ODR print error: %s",
- odr_errlist[odr_geterror(assoc->print)]);
+ yaz_log(LOG_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? */
req = request_head(&assoc->incoming);
if (req->state == REQUEST_IDLE)
- if (process_request(assoc) < 0)
- do_close(assoc, Z_Close_systemProblem, "Unknown error");
+ {
+ request_deq(&assoc->incoming);
+ process_gdu_request(assoc, req);
+ }
}
- if (event & EVENT_OUTPUT)
+ if (event & assoc->cs_put_mask)
{
request *req = request_head(&assoc->outgoing);
- logf(LOG_DEBUG, "ir_session (output)");
- req->state = REQUEST_PENDING;
+ assoc->cs_put_mask = 0;
+ yaz_log(LOG_DEBUG, "ir_session (output)");
+ req->state = REQUEST_PENDING;
switch (res = cs_put(conn, req->response, req->len_response))
{
- case -1:
- logf(LOG_LOG, "Connection closed by client");
- cs_close(conn);
- destroy_association(assoc);
- iochan_destroy(h);
- break;
- case 0: /* all sent - release the request structure */
- logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
- odr_release_mem(req->request_mem);
- request_deq(&assoc->outgoing);
- request_release(req);
- if (!request_head(&assoc->outgoing))
- iochan_clearflag(h, EVENT_OUTPUT);
- break;
- /* value of 1 -- partial send -- is simply ignored */
+ case -1:
+ yaz_log(LOG_LOG, "Connection closed by client");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ break;
+ case 0: /* all sent - release the request structure */
+ yaz_log(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
+#if 0
+ yaz_log(LOG_DEBUG, "HTTP out:\n%.*s", req->len_response,
+ req->response);
+#endif
+ nmem_destroy(req->request_mem);
+ request_deq(&assoc->outgoing);
+ request_release(req);
+ if (!request_head(&assoc->outgoing))
+ { /* restore mask for cs_get operation ... */
+ iochan_clearflag(h, EVENT_OUTPUT|EVENT_INPUT);
+ iochan_setflag(h, assoc->cs_get_mask);
+ yaz_log(LOG_LOG, "queue empty mask=%d", assoc->cs_get_mask);
+ if (assoc->state == ASSOC_DEAD)
+ iochan_setevent(assoc->client_chan, EVENT_TIMEOUT);
+ }
+ else
+ {
+ assoc->cs_put_mask = EVENT_OUTPUT;
+ yaz_log(LOG_LOG, "queue not empty");
+ }
+ break;
+ default:
+ if (conn->io_pending & CS_WANT_WRITE)
+ assoc->cs_put_mask |= EVENT_OUTPUT;
+ if (conn->io_pending & CS_WANT_READ)
+ assoc->cs_put_mask |= EVENT_INPUT;
+ iochan_setflag(h, assoc->cs_put_mask);
}
}
if (event & EVENT_EXCEPT)
{
- logf(LOG_DEBUG, "ir_session (exception)");
+ yaz_log(LOG_LOG, "ir_session (exception)");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
}
}
+static int process_z_request(association *assoc, request *req, char **msg);
+
+static int srw_bend_init(association *assoc)
+{
+ bend_initresult *binitres;
+ statserv_options_block *cb = statserv_getcontrol();
+
+ assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init));
+
+ assoc->init->stream = assoc->encode;
+ assoc->init->print = assoc->print;
+ assoc->init->auth = 0;
+ assoc->init->referenceId = 0;
+ assoc->init->implementation_version = 0;
+ assoc->init->implementation_id = 0;
+ assoc->init->implementation_name = 0;
+ assoc->init->bend_sort = NULL;
+ assoc->init->bend_search = NULL;
+ assoc->init->bend_present = NULL;
+ assoc->init->bend_esrequest = NULL;
+ assoc->init->bend_delete = NULL;
+ assoc->init->bend_scan = NULL;
+ assoc->init->bend_segment = NULL;
+ assoc->init->bend_fetch = NULL;
+ assoc->init->charneg_request = NULL;
+ assoc->init->charneg_response = NULL;
+ assoc->init->decode = assoc->decode;
+
+ assoc->init->peer_name =
+ odr_strdup (assoc->encode, cs_addrstr(assoc->client_link));
+ if (!(binitres = (*cb->bend_init)(assoc->init)))
+ {
+ yaz_log(LOG_WARN, "Bad response from backend.");
+ return 0;
+ }
+ assoc->backend = binitres->handle;
+ return 1;
+}
+
+static void srw_bend_fetch(association *assoc, int pos,
+ Z_SRW_searchRetrieveRequest *srw_req,
+ Z_SRW_record *record)
+{
+ bend_fetch_rr rr;
+ ODR o = assoc->encode;
+
+ 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_TRANSYN,
+ VAL_TEXT_XML);
+ rr.comp = (Z_RecordComposition *)
+ odr_malloc(assoc->decode, sizeof(*rr.comp));
+ rr.comp->which = Z_RecordComp_complex;
+ rr.comp->u.complex = (Z_CompSpec *)
+ odr_malloc(assoc->decode, sizeof(Z_CompSpec));
+ rr.comp->u.complex->selectAlternativeSyntax = (bool_t *)
+ odr_malloc(assoc->encode, sizeof(bool_t));
+ *rr.comp->u.complex->selectAlternativeSyntax = 0;
+ rr.comp->u.complex->num_dbSpecific = 0;
+ rr.comp->u.complex->dbSpecific = 0;
+ rr.comp->u.complex->num_recordSyntax = 0;
+ rr.comp->u.complex->recordSyntax = 0;
+
+ rr.comp->u.complex->generic = (Z_Specification *)
+ odr_malloc(assoc->decode, sizeof(Z_Specification));
+ rr.comp->u.complex->generic->which = Z_Specification_uri;
+ rr.comp->u.complex->generic->u.uri = srw_req->recordSchema;
+ rr.comp->u.complex->generic->elementSpec = 0;
+
+ rr.stream = assoc->encode;
+ rr.print = assoc->print;
+
+ rr.basename = 0;
+ 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;
+
+ (*assoc->init->bend_fetch)(assoc->backend, &rr);
+
+ if (rr.len >= 0)
+ {
+ record->recordData_buf = rr.record;
+ record->recordData_len = rr.len;
+ record->recordPosition = odr_intdup(o, pos);
+ record->recordSchema = 0;
+ if (srw_req->recordSchema)
+ record->recordSchema = odr_strdup(o, srw_req->recordSchema);
+ }
+}
+
+static void srw_bend_search(association *assoc, request *req,
+ Z_SRW_searchRetrieveRequest *srw_req,
+ Z_SRW_searchRetrieveResponse *srw_res)
+{
+ char *base = "Default";
+ bend_search_rr rr;
+ Z_External *ext;
+
+ if (!assoc->init)
+ srw_bend_init(assoc);
+
+ rr.setname = "default";
+ rr.replace_set = 1;
+ rr.num_bases = 1;
+ rr.basenames = &srw_req->database;
+ rr.referenceId = 0;
+
+ 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;
+ if (srw_req->query)
+ ext->u.cql = srw_req->query;
+ else
+ ext->u.cql = "noterm";
+
+ rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
+ rr.query->which = Z_Query_type_104;
+ rr.query->u.type_104 = ext;
+
+ rr.stream = assoc->encode;
+ rr.decode = assoc->decode;
+ rr.print = assoc->print;
+ rr.request = req;
+ rr.association = assoc;
+ rr.fd = 0;
+ rr.hits = 0;
+ rr.errcode = 0;
+ rr.errstring = 0;
+ rr.search_info = 0;
+ yaz_log_zquery(rr.query);
+ (assoc->init->bend_search)(assoc->backend, &rr);
+ srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits);
+ if (rr.errcode)
+ {
+ srw_res->num_diagnostics = 1;
+ srw_res->diagnostics = (Z_SRW_diagnostic *)
+ odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics));
+ srw_res->diagnostics[0].code =
+ odr_intdup(assoc->encode, rr.errcode);
+ srw_res->diagnostics[0].details = rr.errstring;
+ }
+ else
+ {
+ srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits);
+ if (srw_req->maximumRecords && *srw_req->maximumRecords > 0)
+ {
+ int number = *srw_req->maximumRecords;
+ int start = 1;
+ int i;
+ if (srw_req->startRecord)
+ start = *srw_req->startRecord;
+ if (start <= rr.hits)
+ {
+ int j = 0;
+ if (start + number > rr.hits)
+ number = rr.hits - start + 1;
+ srw_res->records = (Z_SRW_record *)
+ odr_malloc(assoc->encode,
+ number * sizeof(*srw_res->records));
+ for (i = 0; i<number; i++)
+ {
+ srw_res->records[j].recordData_buf = 0;
+ srw_bend_fetch(assoc, i+start, srw_req,
+ srw_res->records + j);
+ if (srw_res->records[j].recordData_buf)
+ j++;
+ }
+ srw_res->num_records = j;
+ if (!j)
+ srw_res->records = 0;
+ yaz_log(LOG_LOG, "got %d records", j);
+ }
+ }
+ }
+}
+
+static void process_http_request(association *assoc, request *req)
+{
+ Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request;
+ ODR o = assoc->encode;
+ Z_GDU *p = 0;
+ Z_HTTP_Response *hres = 0;
+ int keepalive = 1;
+
+ if (!strcmp(hreq->method, "GET"))
+ {
+#ifdef DOCDIR
+ if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 &&
+ !memcmp(hreq->path, "/doc/", 5))
+ {
+ FILE *f;
+ char fpath[120];
+
+ strcpy(fpath, DOCDIR);
+ strcat(fpath, hreq->path+4);
+ f = fopen(fpath, "rb");
+ if (f) {
+ struct stat sbuf;
+ if (fstat(fileno(f), &sbuf) || !S_ISREG(sbuf.st_mode))
+ {
+ fclose(f);
+ f = 0;
+ }
+ }
+ if (f)
+ {
+ long sz;
+ fseek(f, 0L, SEEK_END);
+ sz = ftell(f);
+ if (sz >= 0 && sz < 500000)
+ {
+ const char *ctype = "application/octet-stream";
+ const char *cp;
+
+ p = z_get_HTTP_Response(o, 200);
+ hres = p->u.HTTP_Response;
+ hres->content_buf = (char *) odr_malloc(o, sz + 1);
+ hres->content_len = sz;
+ fseek(f, 0L, SEEK_SET);
+ fread(hres->content_buf, 1, sz, f);
+ if ((cp = strrchr(fpath, '.'))) {
+ cp++;
+ if (!strcmp(cp, "png"))
+ ctype = "image/png";
+ else if (!strcmp(cp, "gif"))
+ ctype = "image/gif";
+ else if (!strcmp(cp, "xml"))
+ ctype = "text/xml";
+ else if (!strcmp(cp, "html"))
+ ctype = "text/html";
+ }
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
+ yaz_log(LOG_LOG, "OK send page %s size=%ld", fpath, sz);
+ }
+ fclose(f);
+ }
+ }
+#endif
+ if (!strcmp(hreq->path, "/"))
+ {
+ struct stat sbuf;
+ const char *doclink = "";
+ p = z_get_HTTP_Response(o, 200);
+ hres = p->u.HTTP_Response;
+ hres->content_buf = (char *) odr_malloc(o, 400);
+#ifdef DOCDIR
+ if (stat(DOCDIR "/yaz.html", &sbuf) == 0 && S_ISREG(sbuf.st_mode))
+ doclink = "<P><A HREF=\"/doc/yaz.html\">Documentation</A></P>";
+#endif
+ sprintf (hres->content_buf,
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+ "<HTML>\n"
+ " <HEAD>\n"
+ " <TITLE>YAZ " YAZ_VERSION "</TITLE>\n"
+ " </HEAD>\n"
+ " <BODY>\n"
+ " <P><A HREF=\"http://www.indexdata.dk/yaz/\">YAZ</A> "
+ YAZ_VERSION "</P>\n"
+ "%s"
+ " </BODY>\n"
+ "</HTML>\n", doclink);
+ hres->content_len = strlen(hres->content_buf);
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/html");
+ }
+ if (!p)
+ {
+ p = z_get_HTTP_Response(o, 404);
+ }
+ }
+ else if (!strcmp(hreq->method, "POST"))
+ {
+#if HAVE_XSLT
+ const char *content_type = z_HTTP_header_lookup(hreq->headers,
+ "Content-Type");
+ const char *soap_action = z_HTTP_header_lookup(hreq->headers,
+ "SOAPAction");
+ if (content_type && soap_action &&
+ !yaz_strcmp_del("text/xml", content_type, "; "))
+ {
+ Z_SOAP *soap_package = 0;
+ int ret;
+ int http_code = 500;
+
+ static Z_SOAP_Handler soap_handlers[2] = {
+ {"http://www.loc.gov/zing/srw/v1.0/", 0,
+ (Z_SOAP_fun) yaz_srw_codec},
+ {0, 0, 0}
+ };
+
+ ret = z_soap_codec(assoc->decode, &soap_package,
+ &hreq->content_buf, &hreq->content_len,
+ soap_handlers);
+
+ if (!ret && soap_package->which == Z_SOAP_generic &&
+ soap_package->u.generic->no == 0)
+ {
+ /* SRW package */
+ Z_SRW_searchRetrieve *sr = soap_package->u.generic->p;
+
+ if (sr->which == Z_SRW_searchRetrieve_request)
+ {
+ Z_SRW_searchRetrieve *res =
+ yaz_srw_get(assoc->encode,
+ Z_SRW_searchRetrieve_response);
+
+ if (!sr->u.request->database)
+ {
+ const char *p0 = hreq->path, *p1;
+ if (*p0 == '/')
+ p0++;
+ p1 = strchr(p0, '?');
+ if (!p1)
+ p1 = p0 + strlen(p0);
+ if (p1 != p0)
+ {
+ sr->u.request->database =
+ odr_malloc(assoc->decode, p1 - p0 + 1);
+ memcpy (sr->u.request->database, p0, p1 - p0);
+ sr->u.request->database[p1 - p0] = '\0';
+ }
+ else
+ sr->u.request->database = "Default";
+ }
+ srw_bend_search(assoc, req, sr->u.request,
+ res->u.response);
+
+ soap_package->u.generic->p = res;
+ http_code = 200;
+ }
+ }
+
+ p = z_get_HTTP_Response(o, 200);
+ hres = p->u.HTTP_Response;
+ ret = z_soap_codec(assoc->encode, &soap_package,
+ &hres->content_buf, &hres->content_len,
+ soap_handlers);
+ hres->code = http_code;
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml");
+ }
+#endif
+ if (!p) /* still no response ? */
+ p = z_get_HTTP_Response(o, 500);
+ }
+ else
+ {
+ p = z_get_HTTP_Response(o, 405);
+ hres = p->u.HTTP_Response;
+
+ z_HTTP_header_add(o, &hres->headers, "Allow", "GET, POST");
+ }
+ hres = p->u.HTTP_Response;
+ if (!strcmp(hreq->version, "1.0"))
+ {
+ const char *v = z_HTTP_header_lookup(hreq->headers, "Connection");
+ if (v && !strcmp(v, "Keep-Alive"))
+ keepalive = 1;
+ else
+ keepalive = 0;
+ hres->version = "1.0";
+ }
+ else
+ {
+ const char *v = z_HTTP_header_lookup(hreq->headers, "Connection");
+ if (v && !strcmp(v, "close"))
+ keepalive = 0;
+ else
+ keepalive = 1;
+ hres->version = "1.1";
+ }
+ if (!keepalive)
+ {
+ z_HTTP_header_add(o, &hres->headers, "Connection", "close");
+ assoc->state = ASSOC_DEAD;
+ }
+ else
+ {
+ z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
+ }
+ process_gdu_response(assoc, req, p);
+}
+
+static void process_gdu_request(association *assoc, request *req)
+{
+ if (req->gdu_request->which == Z_GDU_Z3950)
+ {
+ char *msg = 0;
+ req->apdu_request = req->gdu_request->u.z3950;
+ if (process_z_request(assoc, req, &msg) < 0)
+ do_close_req(assoc, Z_Close_systemProblem, msg, req);
+ }
+ else if (req->gdu_request->which == Z_GDU_HTTP_Request)
+ process_http_request(assoc, req);
+ else
+ {
+ do_close_req(assoc, Z_Close_systemProblem, "bad protocol packet", req);
+ }
+}
+
/*
* Initiate request processing.
*/
-static int process_request(association *assoc)
+static int process_z_request(association *assoc, request *req, char **msg)
{
- request *req = request_head(&assoc->incoming);
int fd = -1;
Z_APDU *res;
-
- logf(LOG_DEBUG, "process_request");
+ int retval;
+
+ *msg = "Unknown Error";
assert(req && req->state == REQUEST_IDLE);
- switch (req->request->which)
+ if (req->apdu_request->which != Z_APDU_initRequest && !assoc->init)
{
- case Z_APDU_initRequest:
- res = process_initRequest(assoc, req); break;
- case Z_APDU_searchRequest:
- res = process_searchRequest(assoc, req, &fd); break;
- case Z_APDU_presentRequest:
- res = process_presentRequest(assoc, req, &fd); break;
- case Z_APDU_scanRequest:
- res = process_scanRequest(assoc, req, &fd); break;
- case Z_APDU_close:
- process_close(assoc, req); return 0;
- default:
- logf(LOG_WARN, "Bad APDU received");
+ *msg = "Missing InitRequest";
+ return -1;
+ }
+ switch (req->apdu_request->which)
+ {
+ case Z_APDU_initRequest:
+ res = process_initRequest(assoc, req); break;
+ case Z_APDU_searchRequest:
+ res = process_searchRequest(assoc, req, &fd); break;
+ case Z_APDU_presentRequest:
+ res = process_presentRequest(assoc, req, &fd); break;
+ case Z_APDU_scanRequest:
+ if (assoc->init->bend_scan)
+ res = process_scanRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Scan APDU";
+ return -1;
+ }
+ break;
+ case Z_APDU_extendedServicesRequest:
+ if (assoc->init->bend_esrequest)
+ res = process_ESRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Extended Services APDU";
+ return -1;
+ }
+ break;
+ case Z_APDU_sortRequest:
+ if (assoc->init->bend_sort)
+ res = process_sortRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Sort APDU";
return -1;
+ }
+ break;
+ case Z_APDU_close:
+ process_close(assoc, req);
+ return 0;
+ case Z_APDU_deleteResultSetRequest:
+ if (assoc->init->bend_delete)
+ res = process_deleteRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Delete APDU";
+ return -1;
+ }
+ break;
+ case Z_APDU_segmentRequest:
+ if (assoc->init->bend_segment)
+ {
+ res = process_segmentRequest (assoc, req);
+ }
+ else
+ {
+ *msg = "Cannot handle Segment APDU";
+ return -1;
+ }
+ break;
+ default:
+ *msg = "Bad APDU received";
+ return -1;
}
if (res)
{
- logf(LOG_DEBUG, " result immediately available");
- return process_response(assoc, req, res);
+ yaz_log(LOG_DEBUG, " result immediately available");
+ retval = process_z_response(assoc, req, res);
}
else if (fd < 0)
{
- logf(LOG_WARN, " bad result");
- return -1;
+ yaz_log(LOG_DEBUG, " result unavailble");
+ retval = 0;
}
else /* no result yet - one will be provided later */
{
/* Set up an I/O handler for the fd supplied by the backend */
- logf(LOG_DEBUG, " establishing handler for result");
+ yaz_log(LOG_DEBUG, " establishing handler for result");
req->state = REQUEST_PENDING;
if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT)))
abort();
iochan_setdata(chan, assoc);
- return 0;
+ retval = 0;
}
+ return retval;
}
/*
*/
void backend_response(IOCHAN i, int event)
{
- association *assoc = iochan_getdata(i);
+ association *assoc = (association *)iochan_getdata(i);
request *req = request_head(&assoc->incoming);
Z_APDU *res;
int fd;
- logf(LOG_DEBUG, "backend_response");
+ yaz_log(LOG_DEBUG, "backend_response");
assert(assoc && req && req->state != REQUEST_IDLE);
/* determine what it is we're waiting for */
- switch (req->request->which)
+ switch (req->apdu_request->which)
{
case Z_APDU_searchRequest:
res = response_searchRequest(assoc, req, 0, &fd); break;
res = response_scanRequest(assoc, req, 0, &fd); break;
#endif
default:
- logf(LOG_WARN, "Serious programmer's lapse or bug");
+ yaz_log(LOG_WARN, "Serious programmer's lapse or bug");
abort();
}
- if ((res && process_response(assoc, req, res) < 0) || fd < 0)
+ if ((res && process_z_response(assoc, req, res) < 0) || fd < 0)
{
- logf(LOG_LOG, "Fatal error when talking to backend");
+ yaz_log(LOG_LOG, "Fatal error when talking to backend");
do_close(assoc, Z_Close_systemProblem, 0);
iochan_destroy(i);
return;
}
else if (!res) /* no result yet - try again later */
{
- logf(LOG_DEBUG, " no result yet");
+ yaz_log(LOG_DEBUG, " no result yet");
iochan_setfd(i, fd); /* in case fd has changed */
}
}
/*
* Encode response, and transfer the request structure to the outgoing queue.
*/
-static int process_response(association *assoc, request *req, Z_APDU *res)
+static int process_gdu_response(association *assoc, request *req, Z_GDU *res)
{
odr_setbuf(assoc->encode, req->response, req->size_response, 1);
- if (!z_APDU(assoc->encode, &res, 0))
+
+ if (assoc->print && !z_GDU(assoc->print, &res, 0, 0))
+ {
+ yaz_log(LOG_WARN, "ODR print error: %s",
+ odr_errmsg(odr_geterror(assoc->print)));
+ odr_reset(assoc->print);
+ }
+ if (!z_GDU(assoc->encode, &res, 0, 0))
{
- logf(LOG_WARN, "ODR error when encoding response: %s",
- odr_errlist[odr_geterror(assoc->decode)]);
+ yaz_log(LOG_WARN, "ODR error when encoding response: %s",
+ odr_errmsg(odr_geterror(assoc->decode)));
return -1;
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
&req->size_response);
odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
odr_reset(assoc->encode);
- if (assoc->print && !z_APDU(assoc->print, &res, 0))
+ req->state = REQUEST_IDLE;
+ request_enq(&assoc->outgoing, req);
+ /* turn the work over to the ir_session handler */
+ 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))
+ {
+ yaz_log (LOG_DEBUG, "more work to be done");
+ iochan_setevent(assoc->client_chan, EVENT_WORK);
+ }
+#endif
+ return 0;
+}
+
+/*
+ * Encode response, and transfer the request structure to the outgoing queue.
+ */
+static int process_z_response(association *assoc, request *req, Z_APDU *res)
+{
+ odr_setbuf(assoc->encode, req->response, req->size_response, 1);
+
+ if (assoc->print && !z_APDU(assoc->print, &res, 0, 0))
{
- logf(LOG_WARN, "ODR print error: %s",
- odr_errlist[odr_geterror(assoc->print)]);
+ yaz_log(LOG_WARN, "ODR print error: %s",
+ odr_errmsg(odr_geterror(assoc->print)));
odr_reset(assoc->print);
}
- /* change this when we make the backend reentrant */
- if (req == request_head(&assoc->incoming))
+ if (!z_APDU(assoc->encode, &res, 0, 0))
{
- req->state = REQUEST_IDLE;
- request_deq(&assoc->incoming);
+ yaz_log(LOG_WARN, "ODR error when encoding response: %s",
+ odr_errmsg(odr_geterror(assoc->decode)));
+ return -1;
}
+ req->response = odr_getbuf(assoc->encode, &req->len_response,
+ &req->size_response);
+ odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
+ odr_reset(assoc->encode);
+ req->state = REQUEST_IDLE;
request_enq(&assoc->outgoing, req);
/* turn the work over to the ir_session handler */
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))
+ {
+ yaz_log (LOG_DEBUG, "more work to be done");
iochan_setevent(assoc->client_chan, EVENT_WORK);
+ }
+#endif
return 0;
}
*/
static Z_APDU *process_initRequest(association *assoc, request *reqb)
{
- Z_InitRequest *req = reqb->request->u.initRequest;
+ statserv_options_block *cb = statserv_getcontrol();
+ Z_InitRequest *req = reqb->apdu_request->u.initRequest;
Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse);
Z_InitResponse *resp = apdu->u.initResponse;
- bend_initrequest binitreq;
bend_initresult *binitres;
- char options[100];
- logf(LOG_LOG, "Got initRequest");
+ char options[140];
+
+ xfree (assoc->init);
+ assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init));
+
+ yaz_log(LOG_LOG, "Got initRequest");
if (req->implementationId)
- logf(LOG_LOG, "Id: %s", req->implementationId);
+ yaz_log(LOG_LOG, "Id: %s", req->implementationId);
if (req->implementationName)
- logf(LOG_LOG, "Name: %s", req->implementationName);
+ yaz_log(LOG_LOG, "Name: %s", req->implementationName);
if (req->implementationVersion)
- logf(LOG_LOG, "Version: %s", req->implementationVersion);
-
- binitreq.configname = "default-config";
- binitreq.auth = req->idAuthentication;
- if (!(binitres = bend_init(&binitreq)))
+ yaz_log(LOG_LOG, "Version: %s", req->implementationVersion);
+
+ assoc->init->stream = assoc->encode;
+ assoc->init->print = assoc->print;
+ assoc->init->auth = req->idAuthentication;
+ assoc->init->referenceId = req->referenceId;
+ assoc->init->implementation_version = 0;
+ assoc->init->implementation_id = 0;
+ assoc->init->implementation_name = 0;
+ assoc->init->bend_sort = NULL;
+ assoc->init->bend_search = NULL;
+ assoc->init->bend_present = NULL;
+ assoc->init->bend_esrequest = NULL;
+ assoc->init->bend_delete = NULL;
+ assoc->init->bend_scan = NULL;
+ assoc->init->bend_segment = NULL;
+ assoc->init->bend_fetch = NULL;
+ assoc->init->charneg_request = NULL;
+ assoc->init->charneg_response = NULL;
+ assoc->init->decode = assoc->decode;
+
+ if (ODR_MASK_GET(req->options, Z_Options_negotiationModel))
+ {
+ Z_CharSetandLanguageNegotiation *negotiation =
+ yaz_get_charneg_record (req->otherInfo);
+ if (negotiation->which == Z_CharSetandLanguageNegotiation_proposal)
+ assoc->init->charneg_request = negotiation;
+ }
+
+ assoc->init->peer_name =
+ odr_strdup (assoc->encode, cs_addrstr(assoc->client_link));
+ if (!(binitres = (*cb->bend_init)(assoc->init)))
{
- logf(LOG_WARN, "Bad response from backend.");
+ yaz_log(LOG_WARN, "Bad response from backend.");
return 0;
}
assoc->backend = binitres->handle;
+ if ((assoc->init->bend_sort))
+ yaz_log (LOG_DEBUG, "Sort handler installed");
+ if ((assoc->init->bend_search))
+ yaz_log (LOG_DEBUG, "Search handler installed");
+ if ((assoc->init->bend_present))
+ yaz_log (LOG_DEBUG, "Present handler installed");
+ if ((assoc->init->bend_esrequest))
+ yaz_log (LOG_DEBUG, "ESRequest handler installed");
+ if ((assoc->init->bend_delete))
+ yaz_log (LOG_DEBUG, "Delete handler installed");
+ if ((assoc->init->bend_scan))
+ yaz_log (LOG_DEBUG, "Scan handler installed");
+ if ((assoc->init->bend_segment))
+ yaz_log (LOG_DEBUG, "Segment handler installed");
+
resp->referenceId = req->referenceId;
*options = '\0';
/* let's tell the client what we can do */
ODR_MASK_SET(resp->options, Z_Options_present);
strcat(options, " prst");
}
-#if 0
- if (ODR_MASK_GET(req->options, Z_Options_delSet))
+ if (ODR_MASK_GET(req->options, Z_Options_delSet) &&
+ assoc->init->bend_delete)
{
- ODR_MASK_SET(&options, Z_Options_delSet);
+ ODR_MASK_SET(resp->options, Z_Options_delSet);
strcat(options, " del");
}
-#endif
+ if (ODR_MASK_GET(req->options, Z_Options_extendedServices) &&
+ assoc->init->bend_esrequest)
+ {
+ ODR_MASK_SET(resp->options, Z_Options_extendedServices);
+ strcat (options, " extendedServices");
+ }
if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
{
ODR_MASK_SET(resp->options, Z_Options_namedResultSets);
strcat(options, " namedresults");
}
- if (ODR_MASK_GET(req->options, Z_Options_scan))
+ if (ODR_MASK_GET(req->options, Z_Options_scan) && assoc->init->bend_scan)
{
ODR_MASK_SET(resp->options, Z_Options_scan);
strcat(options, " scan");
if (ODR_MASK_GET(req->options, Z_Options_concurrentOperations))
{
ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
- strcat(options, " concurop");
+ strcat(options, " concurrop");
+ }
+ if (ODR_MASK_GET(req->options, Z_Options_sort) && assoc->init->bend_sort)
+ {
+ ODR_MASK_SET(resp->options, Z_Options_sort);
+ strcat(options, " sort");
+ }
+
+ if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)
+ && assoc->init->charneg_response)
+ {
+ 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);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ assoc->init->charneg_response;
+ }
+ ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
+ strcat(options, " negotiation");
}
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
assoc->version = 3;
}
- logf(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options);
+
+ yaz_log(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options);
assoc->maximumRecordSize = *req->maximumRecordSize;
if (assoc->maximumRecordSize > control_block->maxrecordsize)
assoc->maximumRecordSize = control_block->maxrecordsize;
assoc->preferredMessageSize = *req->preferredMessageSize;
if (assoc->preferredMessageSize > assoc->maximumRecordSize)
assoc->preferredMessageSize = assoc->maximumRecordSize;
+
+#if 0
+ assoc->maximumRecordSize = 3000000;
+ assoc->preferredMessageSize = 3000000;
+#endif
+
resp->preferredMessageSize = &assoc->preferredMessageSize;
resp->maximumRecordSize = &assoc->maximumRecordSize;
- resp->implementationName = "Index Data/YAZ Generic Frontend Server";
+
+ resp->implementationName = "GFS/YAZ";
+
+ if (assoc->init->implementation_id)
+ {
+ char *nv = (char *)
+ odr_malloc (assoc->encode,
+ strlen(assoc->init->implementation_id) + 10 +
+ strlen(resp->implementationId));
+ sprintf (nv, "%s / %s",
+ resp->implementationId, assoc->init->implementation_id);
+ resp->implementationId = nv;
+ }
+ if (assoc->init->implementation_name)
+ {
+ char *nv = (char *)
+ odr_malloc (assoc->encode,
+ strlen(assoc->init->implementation_name) + 10 +
+ strlen(resp->implementationName));
+ sprintf (nv, "%s / %s",
+ resp->implementationName, assoc->init->implementation_name);
+ resp->implementationName = nv;
+ }
+ if (assoc->init->implementation_version)
+ {
+ char *nv = (char *)
+ odr_malloc (assoc->encode,
+ strlen(assoc->init->implementation_version) + 10 +
+ strlen(resp->implementationVersion));
+ sprintf (nv, "YAZ %s / %s",
+ resp->implementationVersion,
+ assoc->init->implementation_version);
+ resp->implementationVersion = nv;
+ }
+
if (binitres->errcode)
{
- logf(LOG_LOG, "Connection rejected by backend.");
+ yaz_log(LOG_LOG, "Connection rejected by backend.");
*resp->result = 0;
assoc->state = ASSOC_DEAD;
}
* These functions should be merged.
*/
+static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo, ODR odr)
+{
+ dr->which = Z_DefaultDiagFormat_v2Addinfo;
+ dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
+}
+
/*
* nonsurrogate diagnostic record.
*/
-static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
+static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
- static Z_Records rec;
- oident bib1;
- static int err;
-#ifdef Z_95
- static Z_DiagRec drec;
- static Z_DefaultDiagFormat dr;
-#else
- static Z_DiagRec dr;
-#endif
-
- bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
- "NULL");
- err = error;
- rec.which = Z_Records_NSD;
-#ifdef Z_95
- rec.u.nonSurrogateDiagnostic = &drec;
- drec.which = Z_DiagRec_defaultFormat;
- drec.u.defaultFormat = &dr;
-#else
- rec.u.nonSurrogateDiagnostic = &dr;
-#endif
- dr.diagnosticSetId = oid_getoidbyent(&bib1);
- dr.condition = &err;
- dr.which = Z_DiagForm_v2AddInfo;
- dr.addinfo = addinfo ? addinfo : "";
- return &rec;
+ Z_Records *rec = (Z_Records *)
+ odr_malloc (assoc->encode, sizeof(*rec));
+ int *err = odr_intdup(assoc->encode, error);
+ Z_DiagRec *drec = (Z_DiagRec *)
+ odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*dr));
+
+ yaz_log(LOG_LOG, "[%d] %s %s%s", error, diagbib1_str(error),
+ addinfo ? " -- " : "", addinfo ? addinfo : "");
+ rec->which = Z_Records_NSD;
+ rec->u.nonSurrogateDiagnostic = dr;
+ dr->diagnosticSetId =
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
+ dr->condition = err;
+ set_addinfo (dr, addinfo, assoc->encode);
+ return rec;
}
/*
* surrogate diagnostic.
*/
-static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
- int error, char *addinfo)
+static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname,
+ int error, char *addinfo)
{
- static Z_NamePlusRecord rec;
- static int err;
- oident bib1;
-#ifdef Z_95
- static Z_DiagRec drec;
- static Z_DefaultDiagFormat dr;
-#else
- static Z_DiagRec dr;
-#endif
-
- bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
- err = error;
- rec.databaseName = dbname;
- rec.which = Z_NamePlusRecord_surrogateDiagnostic;
-#ifdef Z_95
- rec.u.surrogateDiagnostic = &drec;
- drec.which = Z_DiagRec_defaultFormat;
- drec.u.defaultFormat = &dr;
-#else
- rec.u.surrogateDiagnostic = &dr;
-#endif
- dr.diagnosticSetId = oid_getoidbyent(&bib1);
- dr.condition = &err;
- dr.which = Z_DiagForm_v2AddInfo;
- dr.addinfo = addinfo ? addinfo : "";
- return &rec;
+ Z_NamePlusRecord *rec = (Z_NamePlusRecord *)
+ odr_malloc (assoc->encode, sizeof(*rec));
+ int *err = odr_intdup(assoc->encode, error);
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*dr));
+
+ yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
+ rec->databaseName = dbname;
+ rec->which = Z_NamePlusRecord_surrogateDiagnostic;
+ rec->u.surrogateDiagnostic = drec;
+ drec->which = Z_DiagRec_defaultFormat;
+ drec->u.defaultFormat = dr;
+ dr->diagnosticSetId =
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
+ dr->condition = err;
+ set_addinfo (dr, addinfo, assoc->encode);
+
+ return rec;
}
/*
* multiple nonsurrogate diagnostics.
*/
-static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
+static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo)
{
- static Z_DiagRecs recs;
- static int err;
- oident bib1;
-#ifdef Z_95
- static Z_DiagRec *recp[1], drec;
- static Z_DefaultDiagFormat rec;
-#else
- static Z_DiagRec *recp[1], rec;
-#endif
-
- logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
- bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- err = error;
- recs.num_diagRecs = 1;
- recs.diagRecs = recp;
-#ifdef Z_95
- recp[0] = &drec;
- drec.which = Z_DiagRec_defaultFormat;
- drec.u.defaultFormat = &rec;
-#else
- recp[0] = &rec;
-#endif
- rec.diagnosticSetId = oid_getoidbyent(&bib1);
- rec.condition = &err;
- rec.which = Z_DiagForm_v2AddInfo;
- rec.addinfo = addinfo ? addinfo : "";
- return &recs;
+ Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs));
+ int *err = odr_intdup(assoc->encode, error);
+ Z_DiagRec **recp = (Z_DiagRec **)odr_malloc (assoc->encode, sizeof(*recp));
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*rec));
+
+ yaz_log(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : "");
+
+ recs->num_diagRecs = 1;
+ recs->diagRecs = recp;
+ recp[0] = drec;
+ drec->which = Z_DiagRec_defaultFormat;
+ drec->u.defaultFormat = rec;
+
+ rec->diagnosticSetId =
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
+ rec->condition = err;
+
+ rec->which = Z_DefaultDiagFormat_v2Addinfo;
+ rec->u.v2Addinfo = odr_strdup (assoc->encode, addinfo ? addinfo : "");
+ return recs;
}
-#define MAX_RECORDS 256
-
static Z_Records *pack_records(association *a, char *setname, int start,
- int *num, Z_RecordComposition *comp,
- int *next, int *pres, oid_value format)
+ int *num, Z_RecordComposition *comp,
+ int *next, int *pres, oid_value format,
+ Z_ReferenceId *referenceId,
+ int *oid)
{
- int recno, total_length = 0, toget = *num;
- static Z_Records records;
- static Z_NamePlusRecordList reclist;
- static Z_NamePlusRecord *list[MAX_RECORDS];
- oident recform;
-
- records.which = Z_Records_DBOSD;
- records.u.databaseOrSurDiagnostics = &reclist;
- reclist.num_records = 0;
- reclist.records = list;
+ int recno, total_length = 0, toget = *num, dumped_records = 0;
+ Z_Records *records =
+ (Z_Records *) odr_malloc (a->encode, sizeof(*records));
+ Z_NamePlusRecordList *reclist =
+ (Z_NamePlusRecordList *) odr_malloc (a->encode, sizeof(*reclist));
+ Z_NamePlusRecord **list =
+ (Z_NamePlusRecord **) odr_malloc (a->encode, sizeof(*list) * toget);
+
+ records->which = Z_Records_DBOSD;
+ records->u.databaseOrSurDiagnostics = reclist;
+ reclist->num_records = 0;
+ reclist->records = list;
*pres = Z_PRES_SUCCESS;
*num = 0;
*next = 0;
- logf(LOG_DEBUG, "Request to pack %d+%d", start, toget);
- logf(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize,
+ yaz_log(LOG_LOG, "Request to pack %d+%d+%s", start, toget, setname);
+ yaz_log(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize,
a->maximumRecordSize);
- for (recno = start; reclist.num_records < toget; recno++)
+ for (recno = start; reclist->num_records < toget; recno++)
{
- bend_fetchrequest freq;
- bend_fetchresult *fres;
+ bend_fetch_rr freq;
Z_NamePlusRecord *thisrec;
- Z_DatabaseRecord *thisext;
- int this_length;
-
+ int this_length = 0;
/*
* we get the number of bytes allocated on the stream before any
* allocation done by the backend - this should give us a reasonable
* idea of the total size of the data so far.
*/
- total_length = odr_total(a->encode);
- if (reclist.num_records == MAX_RECORDS - 1)
- {
- *pres = Z_PRES_PARTIAL_2;
- break;
- }
+ total_length = odr_total(a->encode) - dumped_records;
+ freq.errcode = 0;
+ freq.errstring = 0;
+ freq.basename = 0;
+ freq.len = 0;
+ freq.record = 0;
+ freq.last_in_set = 0;
freq.setname = setname;
+ freq.surrogate_flag = 0;
freq.number = recno;
freq.comp = comp;
- freq.format = format;
+ freq.request_format = format;
+ freq.request_format_raw = oid;
+ freq.output_format = format;
+ freq.output_format_raw = 0;
freq.stream = a->encode;
- if (!(fres = bend_fetch(a->backend, &freq, 0)))
- {
- *pres = Z_PRES_FAILURE;
- return diagrec(a->proto, 2, "Backend interface problem");
- }
+ freq.print = a->print;
+ freq.surrogate_flag = 0;
+ freq.referenceId = referenceId;
+ (*a->init->bend_fetch)(a->backend, &freq);
/* backend should be able to signal whether error is system-wide
or only pertaining to current record */
- if (fres->errcode)
+ if (freq.errcode)
{
- *pres = Z_PRES_FAILURE;
- return diagrec(a->proto, fres->errcode, fres->errstring);
+ if (!freq.surrogate_flag)
+ {
+ char s[20];
+ *pres = Z_PRES_FAILURE;
+ /* for 'present request out of range',
+ set addinfo to record position if not set */
+ if (freq.errcode == 13 && freq.errstring == 0)
+ {
+ sprintf (s, "%d", recno);
+ freq.errstring = s;
+ }
+ return diagrec(a, freq.errcode, freq.errstring);
+ }
+ reclist->records[reclist->num_records] =
+ surrogatediagrec(a, freq.basename, freq.errcode,
+ freq.errstring);
+ reclist->num_records++;
+ *next = freq.last_in_set ? 0 : recno + 1;
+ continue;
}
- if (fres->len >= 0)
- this_length = fres->len;
+ if (freq.len >= 0)
+ this_length = freq.len;
else
this_length = odr_total(a->encode) - total_length;
- logf(LOG_DEBUG, " fetched record, len=%d, total=%d",
+ yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d",
this_length, total_length);
if (this_length + total_length > a->preferredMessageSize)
{
/* record is small enough, really */
if (this_length <= a->preferredMessageSize)
{
- logf(LOG_DEBUG, " Dropped last normal-sized record");
+ yaz_log(LOG_DEBUG, " Dropped last normal-sized record");
*pres = Z_PRES_PARTIAL_2;
break;
}
/* record can only be fetched by itself */
if (this_length < a->maximumRecordSize)
{
- logf(LOG_DEBUG, " Record > prefmsgsz");
+ yaz_log(LOG_DEBUG, " Record > prefmsgsz");
if (toget > 1)
{
- logf(LOG_DEBUG, " Dropped it");
- reclist.records[reclist.num_records] =
- surrogatediagrec(a->proto, fres->basename, 16, 0);
- reclist.num_records++;
+ yaz_log(LOG_DEBUG, " Dropped it");
+ reclist->records[reclist->num_records] =
+ surrogatediagrec(a, freq.basename, 16, 0);
+ reclist->num_records++;
+ *next = freq.last_in_set ? 0 : recno + 1;
+ dumped_records += this_length;
continue;
}
}
else /* too big entirely */
{
- logf(LOG_DEBUG, "Record > maxrcdsz");
- reclist.records[reclist.num_records] =
- surrogatediagrec(a->proto, fres->basename, 17, 0);
- reclist.num_records++;
+ yaz_log(LOG_LOG, "Record > maxrcdsz this=%d max=%d", this_length, a->maximumRecordSize);
+ reclist->records[reclist->num_records] =
+ surrogatediagrec(a, freq.basename, 17, 0);
+ reclist->num_records++;
+ *next = freq.last_in_set ? 0 : recno + 1;
+ dumped_records += this_length;
continue;
}
}
- if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
+
+ if (!(thisrec = (Z_NamePlusRecord *)
+ odr_malloc(a->encode, sizeof(*thisrec))))
return 0;
- if (!(thisrec->databaseName = odr_malloc(a->encode,
- strlen(fres->basename) + 1)))
+ if (!(thisrec->databaseName = (char *)odr_malloc(a->encode,
+ strlen(freq.basename) + 1)))
return 0;
- strcpy(thisrec->databaseName, fres->basename);
+ strcpy(thisrec->databaseName, freq.basename);
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
- sizeof(Z_DatabaseRecord))))
- return 0;
- recform.proto = a->proto;
- recform.class = CLASS_RECSYN;
- recform.value = fres->format;
- thisext->direct_reference = odr_oiddup(a->encode,
- oid_getoidbyent(&recform));
- thisext->indirect_reference = 0;
- thisext->descriptor = 0;
- if (fres->len < 0) /* Structured data */
- {
- switch (fres->format)
- {
- case VAL_SUTRS: thisext->which = Z_External_sutrs; break;
- case VAL_GRS1: thisext->which = Z_External_grs1; break;
- case VAL_EXPLAIN: thisext->which = Z_External_explainRecord;
- break;
-
- default:
- logf(LOG_FATAL, "Unknown structured format from backend.");
- return 0;
- }
- /*
- * We cheat on the pointers here. Obviously, the record field
- * of the backend-fetch structure should have been a union for
- * correctness, but we're stuck with this for backwards
- * compatibility.
- */
- thisext->u.grs1 = (Z_GenericRecord*) fres->record;
- }
- else if (fres->format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */
- {
- Odr_oct *sutrs = odr_malloc(a->encode, sizeof(*sutrs));
-
- thisext->which = Z_External_sutrs;
- thisext->u.sutrs = sutrs;
- sutrs->buf = odr_malloc(a->encode, fres->len);
- sutrs->len = sutrs->size = fres->len;
- memcpy(sutrs->buf, fres->record, fres->len);
- }
- else /* octet-aligned record. */
+ if (freq.output_format_raw)
{
- thisext->which = Z_External_octet;
- if (!(thisext->u.octet_aligned = odr_malloc(a->encode,
- sizeof(Odr_oct))))
- return 0;
- if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode,
- fres->len)))
- return 0;
- memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len);
- thisext->u.octet_aligned->len = thisext->u.octet_aligned->size =
- fres->len;
+ struct oident *ident = oid_getentbyoid(freq.output_format_raw);
+ freq.output_format = ident->value;
}
- reclist.records[reclist.num_records] = thisrec;
- reclist.num_records++;
- *next = fres->last_in_set ? 0 : recno + 1;
+ thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format,
+ freq.record, freq.len);
+ if (!thisrec->u.databaseRecord)
+ return 0;
+ reclist->records[reclist->num_records] = thisrec;
+ reclist->num_records++;
+ *next = freq.last_in_set ? 0 : recno + 1;
}
- *num = reclist.num_records;
- return &records;
+ *num = reclist->num_records;
+ return records;
}
static Z_APDU *process_searchRequest(association *assoc, request *reqb,
int *fd)
{
- Z_SearchRequest *req = reqb->request->u.searchRequest;
- bend_searchrequest bsrq;
- bend_searchresult *bsrt;
-
- logf(LOG_LOG, "Got SearchRequest.");
-
- bsrq.setname = req->resultSetName;
- bsrq.replace_set = *req->replaceIndicator;
- bsrq.num_bases = req->num_databaseNames;
- bsrq.basenames = req->databaseNames;
- bsrq.query = req->query;
+ Z_SearchRequest *req = reqb->apdu_request->u.searchRequest;
+ bend_search_rr *bsrr =
+ (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr));
+
+ yaz_log(LOG_LOG, "Got SearchRequest.");
+ bsrr->fd = fd;
+ bsrr->request = reqb;
+ bsrr->association = assoc;
+ bsrr->referenceId = req->referenceId;
+ save_referenceId (reqb, bsrr->referenceId);
+
+ yaz_log (LOG_LOG, "ResultSet '%s'", req->resultSetName);
+ if (req->databaseNames)
+ {
+ int i;
+ for (i = 0; i < req->num_databaseNames; i++)
+ yaz_log (LOG_LOG, "Database '%s'", req->databaseNames[i]);
+ }
+ yaz_log_zquery(req->query);
- if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
- return 0;
- return response_searchRequest(assoc, reqb, bsrt, fd);
+ if (assoc->init->bend_search)
+ {
+ bsrr->setname = req->resultSetName;
+ bsrr->replace_set = *req->replaceIndicator;
+ bsrr->num_bases = req->num_databaseNames;
+ bsrr->basenames = req->databaseNames;
+ bsrr->query = req->query;
+ bsrr->stream = assoc->encode;
+ bsrr->decode = assoc->decode;
+ bsrr->print = assoc->print;
+ bsrr->errcode = 0;
+ bsrr->hits = 0;
+ bsrr->errstring = NULL;
+ bsrr->search_info = NULL;
+ (assoc->init->bend_search)(assoc->backend, bsrr);
+ if (!bsrr->request)
+ return 0;
+ }
+ return response_searchRequest(assoc, reqb, bsrr, fd);
}
-bend_searchresult *bend_searchresponse(void *handle) {return 0;}
+int bend_searchresponse(void *handle, bend_search_rr *bsrr) {return 0;}
/*
* Prepare a searchresponse based on the backend results. We probably want
* event, and we'll have to get the response for ourselves.
*/
static Z_APDU *response_searchRequest(association *assoc, request *reqb,
- bend_searchresult *bsrt, int *fd)
+ bend_search_rr *bsrt, int *fd)
{
- Z_SearchRequest *req = reqb->request->u.searchRequest;
- static Z_APDU apdu;
- static Z_SearchResponse resp;
- static int nulint = 0;
- static bool_t sr = 1;
- static int next = 0;
- static int none = Z_RES_NONE;
-
- apdu.which = Z_APDU_searchResponse;
- apdu.u.searchResponse = &resp;
- resp.referenceId = req->referenceId;
-#ifdef Z_95
- resp.additionalSearchInfo = 0;
- resp.otherInfo = 0;
-#endif
+ Z_SearchRequest *req = reqb->apdu_request->u.searchRequest;
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ 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_RES_NONE);
+
+ apdu->which = Z_APDU_searchResponse;
+ apdu->u.searchResponse = resp;
+ resp->referenceId = req->referenceId;
+ resp->additionalSearchInfo = 0;
+ resp->otherInfo = 0;
*fd = -1;
- if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend)))
+ if (!bsrt && !bend_searchresponse(assoc->backend, bsrt))
{
- logf(LOG_FATAL, "Bad result from backend");
+ yaz_log(LOG_FATAL, "Bad result from backend");
return 0;
}
else if (bsrt->errcode)
{
- resp.records = diagrec(assoc->proto, bsrt->errcode,
- bsrt->errstring);
- resp.resultCount = &nulint;
- resp.numberOfRecordsReturned = &nulint;
- resp.nextResultSetPosition = &nulint;
- resp.searchStatus = &nulint;
- resp.resultSetStatus = &none;
- resp.presentStatus = 0;
+ resp->records = diagrec(assoc, bsrt->errcode, bsrt->errstring);
+ resp->resultCount = nulint;
+ resp->numberOfRecordsReturned = nulint;
+ resp->nextResultSetPosition = nulint;
+ resp->searchStatus = nulint;
+ resp->resultSetStatus = none;
+ resp->presentStatus = 0;
}
else
{
- static int toget;
+ int *toget = odr_intdup(assoc->encode, 0);
+ int *presst = odr_intdup(assoc->encode, 0);
Z_RecordComposition comp, *compp = 0;
- static int presst = 0;
- resp.records = 0;
- resp.resultCount = &bsrt->hits;
+ yaz_log (LOG_LOG, "resultCount: %d", bsrt->hits);
+
+ resp->records = 0;
+ resp->resultCount = &bsrt->hits;
comp.which = Z_RecordComp_simple;
/* how many records does the user agent want, then? */
if (bsrt->hits <= *req->smallSetUpperBound)
{
- toget = bsrt->hits;
+ *toget = bsrt->hits;
if ((comp.u.simple = req->smallSetElementSetNames))
compp = ∁
}
else if (bsrt->hits < *req->largeSetLowerBound)
{
- toget = *req->mediumSetPresentNumber;
- if (toget > bsrt->hits)
- toget = bsrt->hits;
+ *toget = *req->mediumSetPresentNumber;
+ if (*toget > bsrt->hits)
+ *toget = bsrt->hits;
if ((comp.u.simple = req->mediumSetElementSetNames))
compp = ∁
}
else
- toget = 0;
+ *toget = 0;
- if (toget && !resp.records)
+ if (*toget && !resp->records)
{
oident *prefformat;
oid_value form;
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
- prefformat->class != CLASS_RECSYN)
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
form = VAL_NONE;
else
form = prefformat->value;
- resp.records = pack_records(assoc, req->resultSetName, 1,
- &toget, compp, &next, &presst, form);
- if (!resp.records)
+ resp->records = pack_records(assoc, req->resultSetName, 1,
+ toget, compp, next, presst, form, req->referenceId,
+ req->preferredRecordSyntax);
+ if (!resp->records)
return 0;
- resp.numberOfRecordsReturned = &toget;
- resp.nextResultSetPosition = &next;
- resp.searchStatus = &sr;
- resp.resultSetStatus = 0;
- resp.presentStatus = &presst;
+ resp->numberOfRecordsReturned = 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;
+ if (*resp->resultCount)
+ *next = 1;
+ resp->numberOfRecordsReturned = nulint;
+ resp->nextResultSetPosition = next;
+ resp->searchStatus = sr;
+ resp->resultSetStatus = 0;
+ resp->presentStatus = 0;
}
}
- return &apdu;
+ resp->additionalSearchInfo = bsrt->search_info;
+ return apdu;
}
/*
* speed - which is normally more true for search than for present.
*/
static Z_APDU *process_presentRequest(association *assoc, request *reqb,
- int *fd)
+ int *fd)
{
- Z_PresentRequest *req = reqb->request->u.presentRequest;
- static Z_APDU apdu;
- static Z_PresentResponse resp;
- static int presst, next, num;
+ Z_PresentRequest *req = reqb->apdu_request->u.presentRequest;
oident *prefformat;
oid_value form;
+ Z_APDU *apdu;
+ Z_PresentResponse *resp;
+ int *next;
+ int *num;
+ yaz_log(LOG_LOG, "Got PresentRequest.");
- logf(LOG_LOG, "Got PresentRequest.");
- apdu.which = Z_APDU_presentResponse;
- apdu.u.presentResponse = &resp;
- resp.referenceId = req->referenceId;
-#ifdef Z_95
- resp.otherInfo = 0;
-#endif
-
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
- prefformat->class != CLASS_RECSYN)
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
form = VAL_NONE;
else
form = prefformat->value;
- num = *req->numberOfRecordsRequested;
- resp.records = pack_records(assoc, req->resultSetId,
- *req->resultSetStartPoint, &num, req->recordComposition, &next,
- &presst, form);
- if (!resp.records)
- return 0;
- resp.numberOfRecordsReturned = #
- resp.presentStatus = &presst;
- resp.nextResultSetPosition = &next;
-
- return &apdu;
+ resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
+ resp->records = 0;
+ resp->presentStatus = odr_intdup(assoc->encode, 0);
+ if (assoc->init->bend_present)
+ {
+ bend_present_rr *bprr = (bend_present_rr *)
+ nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ bprr->setname = req->resultSetId;
+ bprr->start = *req->resultSetStartPoint;
+ bprr->number = *req->numberOfRecordsRequested;
+ bprr->format = form;
+ bprr->comp = req->recordComposition;
+ 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_PRES_FAILURE;
+ }
+ }
+ apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ next = odr_intdup(assoc->encode, 0);
+ num = odr_intdup(assoc->encode, 0);
+
+ apdu->which = Z_APDU_presentResponse;
+ apdu->u.presentResponse = resp;
+ resp->referenceId = req->referenceId;
+ resp->otherInfo = 0;
+
+ if (!resp->records)
+ {
+ *num = *req->numberOfRecordsRequested;
+ resp->records =
+ pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
+ num, req->recordComposition, next, resp->presentStatus,
+ form, req->referenceId, req->preferredRecordSyntax);
+ }
+ if (!resp->records)
+ return 0;
+ resp->numberOfRecordsReturned = num;
+ resp->nextResultSetPosition = next;
+
+ return apdu;
}
/*
*/
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
- Z_ScanRequest *req = reqb->request->u.scanRequest;
- static Z_APDU apdu;
- static Z_ScanResponse res;
- static int scanStatus = Z_Scan_failure;
- static int numberOfEntriesReturned = 0;
- oident *attent;
- static Z_ListEntries ents;
-#define SCAN_MAX_ENTRIES 200
- static Z_Entry *tab[SCAN_MAX_ENTRIES];
- bend_scanrequest srq;
- bend_scanresult *srs;
-
- logf(LOG_LOG, "Got scanrequest");
- apdu.which = Z_APDU_scanResponse;
- apdu.u.scanResponse = &res;
- res.referenceId = req->referenceId;
- res.stepSize = 0;
- res.scanStatus = &scanStatus;
- res.numberOfEntriesReturned = &numberOfEntriesReturned;
- res.positionOfTerm = 0;
- res.entries = &ents;
- ents.which = Z_ListEntries_nonSurrogateDiagnostics;
- res.attributeSet = 0;
-#ifdef Z_95
- res.otherInfo = 0;
-#endif
+ Z_ScanRequest *req = reqb->apdu_request->u.scanRequest;
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_ScanResponse *res = (Z_ScanResponse *)
+ odr_malloc (assoc->encode, sizeof(*res));
+ int *scanStatus = odr_intdup(assoc->encode, Z_Scan_failure);
+ int *numberOfEntriesReturned = odr_intdup(assoc->encode, 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));
+
+ yaz_log(LOG_LOG, "Got ScanRequest");
+
+ apdu->which = Z_APDU_scanResponse;
+ apdu->u.scanResponse = res;
+ res->referenceId = req->referenceId;
+
+ /* if step is absent, set it to 0 */
+ res->stepSize = odr_intdup(assoc->encode, 0);
+ if (req->stepSize)
+ *res->stepSize = *req->stepSize;
+
+ res->scanStatus = scanStatus;
+ res->numberOfEntriesReturned = numberOfEntriesReturned;
+ res->positionOfTerm = 0;
+ res->entries = ents;
+ ents->num_entries = 0;
+ ents->entries = NULL;
+ ents->num_nonsurrogateDiagnostics = 0;
+ ents->nonsurrogateDiagnostics = NULL;
+ res->attributeSet = 0;
+ res->otherInfo = 0;
+
+ if (req->databaseNames)
+ {
+ int i;
+ for (i = 0; i < req->num_databaseNames; i++)
+ yaz_log (LOG_LOG, "Database '%s'", req->databaseNames[i]);
+ }
+ bsrr->num_bases = req->num_databaseNames;
+ bsrr->basenames = req->databaseNames;
+ bsrr->num_entries = *req->numberOfTermsRequested;
+ bsrr->term = req->termListAndStartPoint;
+ bsrr->referenceId = req->referenceId;
+ bsrr->stream = assoc->encode;
+ bsrr->print = assoc->print;
+ bsrr->step_size = res->stepSize;
+ 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;
+ log_scan_term (req->termListAndStartPoint, bsrr->attributeset);
+ bsrr->term_position = req->preferredPositionInResponse ?
+ *req->preferredPositionInResponse : 1;
+ ((int (*)(void *, bend_scan_rr *))
+ (*assoc->init->bend_scan))(assoc->backend, bsrr);
+ if (bsrr->errcode)
+ diagrecs_p = diagrecs(assoc, bsrr->errcode, bsrr->errstring);
+ else
+ {
+ int i;
+ Z_Entry **tab = (Z_Entry **)
+ odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries);
+
+ if (bsrr->status == BEND_SCAN_PARTIAL)
+ *scanStatus = Z_Scan_partial_5;
+ else
+ *scanStatus = Z_Scan_success;
+ ents->entries = tab;
+ ents->num_entries = bsrr->num_entries;
+ res->numberOfEntriesReturned = &ents->num_entries;
+ res->positionOfTerm = &bsrr->term_position;
+ for (i = 0; i < bsrr->num_entries; i++)
+ {
+ Z_Entry *e;
+ Z_TermInfo *t;
+ Odr_oct *o;
+
+ tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e));
+ if (bsrr->entries[i].occurrences >= 0)
+ {
+ e->which = Z_Entry_termInfo;
+ e->u.termInfo = t = (Z_TermInfo *)
+ odr_malloc(assoc->encode, sizeof(*t));
+ t->suggestedAttributes = 0;
+ t->displayTerm = 0;
+ t->alternativeTerm = 0;
+ t->byAttributes = 0;
+ t->otherTermInfo = 0;
+ t->globalOccurrences = &bsrr->entries[i].occurrences;
+ t->term = (Z_Term *)
+ odr_malloc(assoc->encode, sizeof(*t->term));
+ t->term->which = Z_Term_general;
+ t->term->u.general = o =
+ (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct));
+ o->buf = (unsigned char *)
+ odr_malloc(assoc->encode, o->len = o->size =
+ strlen(bsrr->entries[i].term));
+ memcpy(o->buf, bsrr->entries[i].term, o->len);
+ yaz_log(LOG_DEBUG, " term #%d: '%s' (%d)", i,
+ bsrr->entries[i].term, bsrr->entries[i].occurrences);
+ }
+ else
+ {
+ Z_DiagRecs *drecs = diagrecs (assoc,
+ bsrr->entries[i].errcode,
+ bsrr->entries[i].errstring);
+ assert (drecs->num_diagRecs == 1);
+ e->which = Z_Entry_surrogateDiagnostic;
+ assert (drecs->diagRecs[0]);
+ e->u.surrogateDiagnostic = drecs->diagRecs[0];
+ }
+ }
+ }
+ if (diagrecs_p)
+ {
+ ents->num_nonsurrogateDiagnostics = diagrecs_p->num_diagRecs;
+ ents->nonsurrogateDiagnostics = diagrecs_p->diagRecs;
+ }
+ return apdu;
+}
- if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
- attent->class != CLASS_ATTSET || attent->value != VAL_BIB1))
- ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0);
- else if (req->stepSize && *req->stepSize > 0)
- ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);
+static Z_APDU *process_sortRequest(association *assoc, request *reqb,
+ int *fd)
+{
+ Z_SortRequest *req = reqb->apdu_request->u.sortRequest;
+ Z_SortResponse *res = (Z_SortResponse *)
+ odr_malloc (assoc->encode, sizeof(*res));
+ bend_sort_rr *bsrr = (bend_sort_rr *)
+ odr_malloc (assoc->encode, sizeof(*bsrr));
+
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+
+ yaz_log(LOG_LOG, "Got SortRequest.");
+
+ bsrr->num_input_setnames = req->num_inputResultSetNames;
+ bsrr->input_setnames = req->inputResultSetNames;
+ bsrr->referenceId = req->referenceId;
+ bsrr->output_setname = req->sortedResultSetName;
+ bsrr->sort_sequence = req->sortSequence;
+ bsrr->stream = assoc->encode;
+ bsrr->print = assoc->print;
+
+ bsrr->sort_status = Z_SortStatus_failure;
+ bsrr->errcode = 0;
+ bsrr->errstring = 0;
+
+ (*assoc->init->bend_sort)(assoc->backend, bsrr);
+
+ res->referenceId = bsrr->referenceId;
+ res->sortStatus = odr_intdup(assoc->encode, bsrr->sort_status);
+ res->resultSetStatus = 0;
+ if (bsrr->errcode)
+ {
+ Z_DiagRecs *dr = diagrecs (assoc, bsrr->errcode, bsrr->errstring);
+ res->diagnostics = dr->diagRecs;
+ res->num_diagnostics = dr->num_diagRecs;
+ }
else
{
- if (req->termListAndStartPoint->term->which == Z_Term_general)
- logf(LOG_DEBUG, " term: '%.*s'",
- req->termListAndStartPoint->term->u.general->len,
- req->termListAndStartPoint->term->u.general->buf);
- srq.num_bases = req->num_databaseNames;
- srq.basenames = req->databaseNames;
- srq.num_entries = *req->numberOfTermsRequested;
- srq.term = req->termListAndStartPoint;
- srq.term_position = req->preferredPositionInResponse ?
- *req->preferredPositionInResponse : 1;
- if (!(srs = bend_scan(assoc->backend, &srq, 0)))
- ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 2, 0);
- else if (srs->errcode)
- ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto,
- srs->errcode, srs->errstring);
- else
- {
- int i;
- static Z_Entries list;
+ res->num_diagnostics = 0;
+ res->diagnostics = 0;
+ }
+ res->otherInfo = 0;
- if (srs->status == BEND_SCAN_PARTIAL)
- scanStatus = Z_Scan_partial_5;
- else
- scanStatus = Z_Scan_success;
- ents.which = Z_ListEntries_entries;
- ents.u.entries = &list;
- list.entries = tab;
- for (i = 0; i < srs->num_entries; i++)
- {
- Z_Entry *e;
- Z_TermInfo *t;
- Odr_oct *o;
+ apdu->which = Z_APDU_sortResponse;
+ apdu->u.sortResponse = res;
+ return apdu;
+}
- if (i >= SCAN_MAX_ENTRIES)
- {
- scanStatus = Z_Scan_partial_4;
- break;
- }
- list.entries[i] = e = odr_malloc(assoc->encode, sizeof(*e));
- e->which = Z_Entry_termInfo;
- e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t));
- t->suggestedAttributes = 0;
- t->alternativeTerm = 0;
- t->byAttributes = 0;
- t->globalOccurrences = &srs->entries[i].occurrences;
- t->term = odr_malloc(assoc->encode, sizeof(*t->term));
- t->term->which = Z_Term_general;
- t->term->u.general = o = odr_malloc(assoc->encode,
- sizeof(Odr_oct));
- o->buf = odr_malloc(assoc->encode, o->len = o->size =
- strlen(srs->entries[i].term));
- memcpy(o->buf, srs->entries[i].term, o->len);
- logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
- srs->entries[i].term, srs->entries[i].occurrences);
- }
- list.num_entries = i;
- res.numberOfEntriesReturned = &list.num_entries;
- res.positionOfTerm = &srs->term_position;
+static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
+ int *fd)
+{
+ Z_DeleteResultSetRequest *req =
+ reqb->apdu_request->u.deleteResultSetRequest;
+ Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *)
+ odr_malloc (assoc->encode, sizeof(*res));
+ bend_delete_rr *bdrr = (bend_delete_rr *)
+ odr_malloc (assoc->encode, sizeof(*bdrr));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+
+ yaz_log(LOG_LOG, "Got DeleteRequest.");
+
+ bdrr->num_setnames = req->num_resultSetList;
+ bdrr->setnames = req->resultSetList;
+ bdrr->stream = assoc->encode;
+ bdrr->print = assoc->print;
+ bdrr->function = *req->deleteFunction;
+ bdrr->referenceId = req->referenceId;
+ bdrr->statuses = 0;
+ if (bdrr->num_setnames > 0)
+ {
+ int i;
+ bdrr->statuses = (int*)
+ odr_malloc(assoc->encode, sizeof(*bdrr->statuses) *
+ bdrr->num_setnames);
+ for (i = 0; i < bdrr->num_setnames; i++)
+ bdrr->statuses[i] = 0;
+ }
+ (*assoc->init->bend_delete)(assoc->backend, bdrr);
+
+ res->referenceId = req->referenceId;
+
+ res->deleteOperationStatus = odr_intdup(assoc->encode,bdrr->delete_status);
+
+ res->deleteListStatuses = 0;
+ if (bdrr->num_setnames > 0)
+ {
+ int i;
+ res->deleteListStatuses = (Z_ListStatuses *)
+ odr_malloc(assoc->encode, sizeof(*res->deleteListStatuses));
+ res->deleteListStatuses->num = bdrr->num_setnames;
+ res->deleteListStatuses->elements =
+ (Z_ListStatus **)
+ odr_malloc (assoc->encode,
+ sizeof(*res->deleteListStatuses->elements) *
+ bdrr->num_setnames);
+ for (i = 0; i<bdrr->num_setnames; i++)
+ {
+ res->deleteListStatuses->elements[i] =
+ (Z_ListStatus *)
+ odr_malloc (assoc->encode,
+ sizeof(**res->deleteListStatuses->elements));
+ res->deleteListStatuses->elements[i]->status = bdrr->statuses+i;
+ res->deleteListStatuses->elements[i]->id =
+ odr_strdup (assoc->encode, bdrr->setnames[i]);
+
}
}
+ res->numberNotDeleted = 0;
+ res->bulkStatuses = 0;
+ res->deleteMessage = 0;
+ res->otherInfo = 0;
- return &apdu;
+ apdu->which = Z_APDU_deleteResultSetResponse;
+ apdu->u.deleteResultSetResponse = res;
+ return apdu;
}
static void process_close(association *assoc, request *reqb)
{
- Z_Close *req = reqb->request->u.close;
+ Z_Close *req = reqb->apdu_request->u.close;
static char *reasons[] =
{
"finished",
"unspecified"
};
- logf(LOG_LOG, "Got close, reason %s, message %s",
+ yaz_log(LOG_LOG, "Got Close, reason %s, message %s",
reasons[*req->closeReason], req->diagnosticInformation ?
req->diagnosticInformation : "NULL");
if (assoc->version < 3) /* to make do_force respond with close */
assoc->version = 3;
- do_close(assoc, Z_Close_finished, "Association terminated by client");
+ do_close_req(assoc, Z_Close_finished,
+ "Association terminated by client", reqb);
}
+
+void save_referenceId (request *reqb, Z_ReferenceId *refid)
+{
+ if (refid)
+ {
+ reqb->len_refid = refid->len;
+ reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len);
+ memcpy (reqb->refid, refid->buf, refid->len);
+ }
+ else
+ {
+ reqb->len_refid = 0;
+ reqb->refid = NULL;
+ }
+}
+
+void bend_request_send (bend_association a, bend_request req, Z_APDU *res)
+{
+ process_z_response (a, req, res);
+}
+
+bend_request bend_request_mk (bend_association a)
+{
+ request *nreq = request_get (&a->outgoing);
+ nreq->request_mem = nmem_create ();
+ return nreq;
+}
+
+Z_ReferenceId *bend_request_getid (ODR odr, bend_request req)
+{
+ Z_ReferenceId *id;
+ if (!req->refid)
+ return 0;
+ id = (Odr_oct *)odr_malloc (odr, sizeof(*odr));
+ id->buf = (unsigned char *)odr_malloc (odr, req->len_refid);
+ id->len = id->size = req->len_refid;
+ memcpy (id->buf, req->refid, req->len_refid);
+ return id;
+}
+
+void bend_request_destroy (bend_request *req)
+{
+ nmem_destroy((*req)->request_mem);
+ request_release(*req);
+ *req = NULL;
+}
+
+int bend_backend_respond (bend_association a, bend_request req)
+{
+ char *msg;
+ int r;
+ r = process_z_request (a, req, &msg);
+ if (r < 0)
+ yaz_log (LOG_WARN, "%s", msg);
+ return r;
+}
+
+void bend_request_setdata(bend_request r, void *p)
+{
+ r->clientData = p;
+}
+
+void *bend_request_getdata(bend_request r)
+{
+ return r->clientData;
+}
+
+static Z_APDU *process_segmentRequest (association *assoc, request *reqb)
+{
+ bend_segment_rr req;
+
+ req.segment = reqb->apdu_request->u.segmentRequest;
+ req.stream = assoc->encode;
+ req.decode = assoc->decode;
+ req.print = assoc->print;
+ req.association = assoc;
+
+ (*assoc->init->bend_segment)(assoc->backend, &req);
+
+ return 0;
+}
+
+static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
+{
+ bend_esrequest_rr esrequest;
+
+ Z_ExtendedServicesRequest *req =
+ reqb->apdu_request->u.extendedServicesRequest;
+ Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_extendedServicesResponse);
+
+ Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse;
+
+ yaz_log(LOG_DEBUG,"inside Process esRequest");
+
+ esrequest.esr = reqb->apdu_request->u.extendedServicesRequest;
+ esrequest.stream = assoc->encode;
+ esrequest.decode = assoc->decode;
+ esrequest.print = assoc->print;
+ esrequest.errcode = 0;
+ esrequest.errstring = NULL;
+ esrequest.request = reqb;
+ esrequest.association = assoc;
+ esrequest.taskPackage = 0;
+ esrequest.referenceId = req->referenceId;
+
+ (*assoc->init->bend_esrequest)(assoc->backend, &esrequest);
+
+ /* If the response is being delayed, return NULL */
+ if (esrequest.request == NULL)
+ return(NULL);
+
+ resp->referenceId = req->referenceId;
+
+ if (esrequest.errcode == -1)
+ {
+ /* Backend service indicates request will be processed */
+ yaz_log(LOG_DEBUG,"Request could be processed...Accepted !");
+ *resp->operationStatus = Z_ExtendedServicesResponse_accepted;
+ }
+ else if (esrequest.errcode == 0)
+ {
+ /* Backend service indicates request will be processed */
+ yaz_log(LOG_DEBUG,"Request could be processed...Done !");
+ *resp->operationStatus = Z_ExtendedServicesResponse_done;
+ }
+ else
+ {
+ Z_DiagRecs *diagRecs = diagrecs (assoc, esrequest.errcode,
+ esrequest.errstring);
+
+ /* Backend indicates error, request will not be processed */
+ yaz_log(LOG_DEBUG,"Request could not be processed...failure !");
+ *resp->operationStatus = Z_ExtendedServicesResponse_failure;
+ resp->num_diagnostics = diagRecs->num_diagRecs;
+ resp->diagnostics = diagRecs->diagRecs;
+ }
+ /* 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);
+ yaz_log(LOG_DEBUG,"Send the result apdu");
+ return apdu;
+}
+
projects / yaz-moved-to-github.git / blobdiff