/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.65 1997-09-01 08:53:01 adam
+ * Revision 1.100 1999-12-16 23:36:19 adam
+ * Implemented ILL protocol. Minor updates ASN.1 compiler.
+ *
+ * Revision 1.99 1999/11/30 13:47:12 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.98 1999/11/29 15:12:27 adam
+ * Changed the way implementationName - and version is set.
+ *
+ * Revision 1.96 1999/11/04 14:58:44 adam
+ * Added status elements for backend delete result set handler.
+ * Updated delete result result set command for client.
+ *
+ * Revision 1.95 1999/10/11 10:01:24 adam
+ * Implemented bend_sort_rr handler for frontend server.
+ *
+ * Revision 1.94 1999/08/27 09:40:32 adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.93 1999/07/06 12:17:15 adam
+ * Added option -1 that runs server once (for profiling purposes).
+ *
+ * Revision 1.92 1999/06/17 10:54:45 adam
+ * Added facility to specify implementation version - and name
+ * for server.
+ *
+ * Revision 1.91 1999/06/01 14:29:12 adam
+ * Work on Extended Services.
+ *
+ * Revision 1.90 1999/05/27 13:02:20 adam
+ * Assigned OID for old DB Update (VAL_DBUPDATE0).
+ *
+ * Revision 1.89 1999/05/26 15:24:26 adam
+ * Fixed minor bugs regarding DB Update (introduced by previous commit).
+ *
+ * Revision 1.88 1999/04/20 09:56:48 adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.87 1999/03/31 11:18:25 adam
+ * Implemented odr_strdup. Added Reference ID to backend server API.
+ *
+ * Revision 1.86 1999/02/02 13:57:38 adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.85 1998/11/17 09:52:59 adam
+ * Fixed minor bug (introduced by previous commit).
+ *
+ * Revision 1.84 1998/11/16 16:02:32 adam
+ * Added loggin utilies, log_rpn_query and log_scan_term. These used
+ * to be part of Zebra.
+ *
+ * Revision 1.83 1998/11/03 10:09:36 adam
+ * Fixed bug regarding YC.
+ *
+ * Revision 1.82 1998/10/20 14:00:30 quinn
+ * Fixed Scan
+ *
+ * Revision 1.81 1998/10/13 16:12:24 adam
+ * Added support for Surrogate Diagnostics for Scan Term entries.
+ *
+ * Revision 1.80 1998/09/02 12:41:53 adam
+ * Added decode stream in bend search structures.
+ *
+ * Revision 1.79 1998/08/19 16:10:08 adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.78 1998/08/03 10:23:55 adam
+ * Fixed bug regarding Options for Sort.
+ *
+ * Revision 1.77 1998/07/20 12:38:42 adam
+ * Implemented delete result set service to server API.
+ *
+ * Revision 1.76 1998/05/27 16:57:07 adam
+ * Support for surrogate diagnostic records added for bend_fetch.
+ *
+ * Revision 1.75 1998/05/18 10:13:07 adam
+ * Fixed call to es_request handler - extra argument was passed.
+ *
+ * Revision 1.74 1998/03/31 15:13:20 adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.73 1998/03/31 11:07:45 adam
+ * Furhter work on UNIverse resource report.
+ * Added Extended Services handling in frontend server.
+ *
+ * Revision 1.72 1998/02/11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.71 1998/02/10 11:03:57 adam
+ * Added support for extended handlers in backend server interface.
+ *
+ * Revision 1.70 1998/01/29 13:15:35 adam
+ * Implemented sort for the backend interface.
+ *
+ * Revision 1.69 1997/09/30 11:48:12 adam
+ * Fixed bug introduced by previous commit.
+ *
+ * Revision 1.68 1997/09/29 13:18:59 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.67 1997/09/17 12:10:40 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.66 1997/09/05 15:26:44 adam
+ * Added ODR encode in search and scen bend request structures.
+ * Fixed a few enums that caused trouble with C++.
+ *
+ * Revision 1.65 1997/09/01 08:53:01 adam
* New windows NT/95 port using MSV5.0. The test server 'ztest' was
* moved a separate directory. MSV5.0 project server.dsp created.
* As an option, the server can now operate as an NT service.
*
*/
-#include <yconfig.h>
#include <stdlib.h>
#include <stdio.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <process.h>
#else
#include <unistd.h>
#endif
#include <assert.h>
-#include <xmalloc.h>
-#include <comstack.h>
+#include <yaz/yconfig.h>
+#include <yaz/xmalloc.h>
+#include <yaz/comstack.h>
#include "eventl.h"
#include "session.h"
-#include <proto.h>
-#include <oid.h>
-#include <log.h>
-#include <statserv.h>
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/logrpn.h>
+#include <yaz/statserv.h>
-#include <backend.h>
+#include <yaz/backend.h>
-static int process_request(association *assoc);
+static int process_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 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 int bend_default_scan (void *handle, bend_scan_rr *rr);
static FILE *apduf = 0; /* for use in static mode */
static statserv_options_block *control_block = 0;
+/* Chas: Added in from DALI */
+static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd);
+/* Chas: End of addition from DALI */
+
/*
* 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->client_chan = channel;
+ anew->client_link = link;
+ 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 (!(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;
}
/*
request_delq(&h->incoming);
request_delq(&h->outgoing);
xfree(h);
+ 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(&a->outgoing);
-
+
/* 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;
}
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)
{
- logf(LOG_DEBUG, "ir_session (input)");
+ yaz_log(LOG_DEBUG, "ir_session (input)");
assert(assoc && conn);
/* 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);
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);
iochan_setevent(h, EVENT_INPUT);
/* we got a complete PDU. Let's decode it */
- logf(LOG_DEBUG, "Got PDU, %d bytes", res);
+ yaz_log(LOG_DEBUG, "Got PDU, %d bytes", res);
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_APDU(assoc->decode, &req->request, 0, 0))
{
- logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+ yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
odr_errmsg(odr_geterror(assoc->decode)),
odr_offset(assoc->decode));
- logf(LOG_LOG, "PDU dump:");
+ yaz_log(LOG_LOG, "PDU dump:");
odr_dumpBER(log_file(), assoc->input_buffer, res);
do_close(assoc, Z_Close_protocolError, "Malformed package");
return;
}
req->request_mem = odr_extract_mem(assoc->decode);
- if (assoc->print && !z_APDU(assoc->print, &req->request, 0))
+ if (assoc->print && !z_APDU(assoc->print, &req->request, 0, 0))
{
- logf(LOG_WARN, "ODR print error: %s",
+ yaz_log(LOG_WARN, "ODR print error: %s",
odr_errmsg(odr_geterror(assoc->print)));
odr_reset(assoc->print);
}
/* 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");
+ {
+ char *msg;
+ request_deq(&assoc->incoming);
+ if (process_request(assoc, req, &msg) < 0)
+ do_close_req(assoc, Z_Close_systemProblem, msg, req);
+ }
}
if (event & EVENT_OUTPUT)
{
request *req = request_head(&assoc->outgoing);
- logf(LOG_DEBUG, "ir_session (output)");
+ 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");
+ 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 */
- logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
+ yaz_log(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
nmem_destroy(req->request_mem);
request_deq(&assoc->outgoing);
request_release(req);
}
if (event & EVENT_EXCEPT)
{
- logf(LOG_DEBUG, "ir_session (exception)");
+ yaz_log(LOG_DEBUG, "ir_session (exception)");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
/*
* Initiate request processing.
*/
-static int process_request(association *assoc)
+static int process_request(association *assoc, request *req, char **msg)
{
- request *req = request_head(&assoc->incoming);
int fd = -1;
Z_APDU *res;
+ int retval;
- logf(LOG_DEBUG, "process_request");
+ *msg = "Unknown Error";
assert(req && req->state == REQUEST_IDLE);
switch (req->request->which)
{
case Z_APDU_presentRequest:
res = process_presentRequest(assoc, req, &fd); break;
case Z_APDU_scanRequest:
- res = process_scanRequest(assoc, req, &fd); break;
+ if (assoc->bend_scan)
+ res = process_scanRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Scan APDU";
+ return -1;
+ }
+ break;
+ case Z_APDU_extendedServicesRequest:
+ if (assoc->bend_esrequest)
+ res = process_ESRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Extended Services APDU";
+ return -1;
+ }
+ break;
+ case Z_APDU_sortRequest:
+ if (assoc->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;
+ process_close(assoc, req);
+ return 0;
+ case Z_APDU_deleteResultSetRequest:
+ if (assoc->bend_delete)
+ res = process_deleteRequest(assoc, req, &fd);
+ else
+ {
+ *msg = "Cannot handle Delete APDU";
+ return -1;
+ }
+ break;
default:
- logf(LOG_WARN, "Bad APDU received");
+ *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_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)
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)
{
- 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 */
}
}
static int process_response(association *assoc, request *req, Z_APDU *res)
{
odr_setbuf(assoc->encode, req->response, req->size_response, 1);
- if (!z_APDU(assoc->encode, &res, 0))
+ if (!z_APDU(assoc->encode, &res, 0, 0))
{
- logf(LOG_WARN, "ODR error when encoding response: %s",
+ yaz_log(LOG_WARN, "ODR error when encoding response: %s",
odr_errmsg(odr_geterror(assoc->decode)));
odr_reset(assoc->encode);
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))
+ if (assoc->print && !z_APDU(assoc->print, &res, 0, 0))
{
- logf(LOG_WARN, "ODR print error: %s",
+ 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))
- {
- req->state = REQUEST_IDLE;
- request_deq(&assoc->incoming);
- }
+ 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);
/* 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;
}
bend_initresult *binitres;
char options[100];
- logf(LOG_LOG, "Got initRequest");
+ 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);
+ yaz_log(LOG_LOG, "Version: %s", req->implementationVersion);
+ binitreq.stream = assoc->encode;
binitreq.configname = "default-config";
binitreq.auth = req->idAuthentication;
+ binitreq.referenceId = req->referenceId;
+ binitreq.implementation_version = 0;
+ binitreq.implementation_name = 0;
+ binitreq.bend_sort = NULL;
+ binitreq.bend_search = NULL;
+ binitreq.bend_present = NULL;
+ binitreq.bend_esrequest = NULL;
+ binitreq.bend_delete = NULL;
+ binitreq.bend_scan = bend_default_scan;
if (!(binitres = bend_init(&binitreq)))
{
- logf(LOG_WARN, "Bad response from backend.");
+ yaz_log(LOG_WARN, "Bad response from backend.");
return 0;
}
assoc->backend = binitres->handle;
+ if ((assoc->bend_sort = (int (*)())binitreq.bend_sort))
+ yaz_log (LOG_DEBUG, "Sort handler installed");
+ if ((assoc->bend_search = (int (*)())binitreq.bend_search))
+ yaz_log (LOG_DEBUG, "Search handler installed");
+ if ((assoc->bend_present = (int (*)())binitreq.bend_present))
+ yaz_log (LOG_DEBUG, "Present handler installed");
+ if ((assoc->bend_esrequest = (int (*)())binitreq.bend_esrequest))
+ yaz_log (LOG_DEBUG, "ESRequest handler installed");
+ if ((assoc->bend_delete = (int (*)())binitreq.bend_delete))
+ yaz_log (LOG_DEBUG, "Delete handler installed");
+ if ((assoc->bend_scan = (int (*)())binitreq.bend_scan))
+ yaz_log (LOG_DEBUG, "Scan 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) && binitreq.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) &&
+ binitreq.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) && binitreq.bend_scan)
{
ODR_MASK_SET(resp->options, Z_Options_scan);
strcat(options, " scan");
ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
strcat(options, " concurop");
}
-
+ if (ODR_MASK_GET(req->options, Z_Options_sort) && binitreq.bend_sort)
+ {
+ ODR_MASK_SET(resp->options, Z_Options_sort);
+ strcat(options, " sort");
+ }
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
{
ODR_MASK_SET(resp->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 = assoc->maximumRecordSize;
resp->preferredMessageSize = &assoc->preferredMessageSize;
resp->maximumRecordSize = &assoc->maximumRecordSize;
- resp->implementationName = "Index Data/YAZ Generic Frontend Server";
+
+ resp->implementationName = "GFS";
+
+ if (binitreq.implementation_name)
+ {
+ char *nv = (char *)
+ odr_malloc (assoc->encode,
+ strlen(binitreq.implementation_name) + 10 +
+ strlen(resp->implementationName));
+ sprintf (nv, "%s / %s",
+ resp->implementationName, binitreq.implementation_name);
+ resp->implementationName = nv;
+ }
+ if (binitreq.implementation_version)
+ {
+ char *nv = (char *)
+ odr_malloc (assoc->encode,
+ strlen(binitreq.implementation_version) + 10 +
+ strlen(resp->implementationVersion));
+ sprintf (nv, "YAZ %s / %s",
+ resp->implementationVersion, binitreq.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)
+{
+#if ASN_COMPILED
+ dr->which = Z_DefaultDiagFormat_v2Addinfo;
+ dr->u.v2Addinfo = addinfo ? addinfo : "";
+#else
+ dr->which = Z_DiagForm_v2AddInfo;
+ dr->addinfo = addinfo ? addinfo : "";
+#endif
+}
+
/*
* nonsurrogate diagnostic record.
*/
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
- Z_Records *rec = odr_malloc (assoc->encode, sizeof(*rec));
+ int oid[OID_SIZE];
+ Z_Records *rec = (Z_Records *)
+ odr_malloc (assoc->encode, sizeof(*rec));
oident bib1;
- int *err = odr_malloc (assoc->encode, sizeof(*err));
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr));
+ int *err = (int *)
+ odr_malloc (assoc->encode, sizeof(*err));
+ Z_DiagRec *drec = (Z_DiagRec *)
+ odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*dr));
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
- logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
+ yaz_log(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
"NULL");
*err = error;
rec->which = Z_Records_NSD;
-#ifdef Z_95
+#if ASN_COMPILED
+ rec->u.nonSurrogateDiagnostic = dr;
+#else
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->diagnosticSetId =
+ odr_oiddup (assoc->encode, oid_ent_to_oid(&bib1, oid));
dr->condition = err;
- dr->which = Z_DiagForm_v2AddInfo;
- dr->addinfo = addinfo ? addinfo : "";
+ set_addinfo (dr, addinfo);
return rec;
}
* surrogate diagnostic.
*/
static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname,
- int error, char *addinfo)
+ int error, char *addinfo)
{
- Z_NamePlusRecord *rec = odr_malloc (assoc->encode, sizeof(*rec));
- int *err = odr_malloc (assoc->encode, sizeof(*err));
+ int oid[OID_SIZE];
+ Z_NamePlusRecord *rec = (Z_NamePlusRecord *)
+ odr_malloc (assoc->encode, sizeof(*rec));
+ int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr));
-
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*dr));
+
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
- logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
+ yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
*err = error;
rec->databaseName = dbname;
rec->which = Z_NamePlusRecord_surrogateDiagnostic;
rec->u.surrogateDiagnostic = drec;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = dr;
- dr->diagnosticSetId = oid_getoidbyent(&bib1);
+ dr->diagnosticSetId = odr_oiddup (assoc->encode,
+ oid_ent_to_oid(&bib1, oid));
dr->condition = err;
- dr->which = Z_DiagForm_v2AddInfo;
- dr->addinfo = addinfo ? addinfo : "";
+ set_addinfo (dr, addinfo);
+
return rec;
}
*/
static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo)
{
- Z_DiagRecs *recs = odr_malloc (assoc->encode, sizeof(*recs));
- int *err = odr_malloc (assoc->encode, sizeof(*err));
+ int oid[OID_SIZE];
+ Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs));
+ int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
- Z_DiagRec **recp = odr_malloc (assoc->encode, sizeof(*recp));
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *rec = odr_malloc (assoc->encode, sizeof(*rec));
+ 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));
- logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
+ yaz_log(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : "");
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = rec;
- rec->diagnosticSetId = oid_getoidbyent(&bib1);
+ rec->diagnosticSetId = odr_oiddup (assoc->encode,
+ oid_ent_to_oid(&bib1, oid));
rec->condition = err;
+
+#ifdef ASN_COMPILED
+ rec->which = Z_DefaultDiagFormat_v2Addinfo;
+ rec->u.v2Addinfo = addinfo ? addinfo : "";
+#else
rec->which = Z_DiagForm_v2AddInfo;
rec->addinfo = addinfo ? addinfo : "";
+#endif
return recs;
}
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, oid_value format,
+ Z_ReferenceId *referenceId)
{
int recno, total_length = 0, toget = *num, dumped_records = 0;
- Z_Records *records = odr_malloc (a->encode, sizeof(*records));
- Z_NamePlusRecordList *reclist = odr_malloc (a->encode, sizeof(*reclist));
- Z_NamePlusRecord **list = odr_malloc (a->encode, sizeof(*list) * toget);
- oident recform;
+ 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;
*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", start, toget);
+ yaz_log(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize,
a->maximumRecordSize);
for (recno = start; reclist->num_records < toget; recno++)
{
bend_fetchrequest freq;
bend_fetchresult *fres;
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
freq.comp = comp;
freq.format = format;
freq.stream = a->encode;
+ freq.surrogate_flag = 0;
+ freq.referenceId = referenceId;
if (!(fres = bend_fetch(a->backend, &freq, 0)))
{
*pres = Z_PRES_FAILURE;
or only pertaining to current record */
if (fres->errcode)
{
- *pres = Z_PRES_FAILURE;
- return diagrec(a, fres->errcode, fres->errstring);
+ if (!freq.surrogate_flag)
+ {
+ *pres = Z_PRES_FAILURE;
+ return diagrec(a, fres->errcode, fres->errstring);
+ }
+ reclist->records[reclist->num_records] =
+ surrogatediagrec(a, fres->basename, fres->errcode,
+ fres->errstring);
+ reclist->num_records++;
+ *next = fres->last_in_set ? 0 : recno + 1;
+ continue;
}
if (fres->len >= 0)
this_length = fres->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");
+ yaz_log(LOG_DEBUG, " Dropped it");
reclist->records[reclist->num_records] =
surrogatediagrec(a, fres->basename, 16, 0);
reclist->num_records++;
}
else /* too big entirely */
{
- logf(LOG_DEBUG, "Record > maxrcdsz");
+ yaz_log(LOG_DEBUG, "Record > maxrcdsz");
reclist->records[reclist->num_records] =
surrogatediagrec(a, fres->basename, 17, 0);
reclist->num_records++;
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,
+ if (!(thisrec->databaseName = (char *)odr_malloc(a->encode,
strlen(fres->basename) + 1)))
return 0;
strcpy(thisrec->databaseName, fres->basename);
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
- sizeof(Z_DatabaseRecord))))
+ thisrec->u.databaseRecord = z_ext_record(a->encode, fres->format,
+ fres->record, fres->len);
+ if (!thisrec->u.databaseRecord)
return 0;
- recform.proto = a->proto;
- recform.oclass = 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;
- case VAL_SUMMARY: thisext->which = Z_External_summary; break;
- case VAL_OPAC: thisext->which = Z_External_OPAC; 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. */
- {
- 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;
- }
reclist->records[reclist->num_records] = thisrec;
reclist->num_records++;
*next = fres->last_in_set ? 0 : recno + 1;
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;
-
- if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
- return 0;
- return response_searchRequest(assoc, reqb, bsrt, fd);
+ 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]);
+ }
+ switch (req->query->which)
+ {
+ case Z_Query_type_1: case Z_Query_type_101:
+ log_rpn_query (req->query->u.type_1);
+ }
+ if (assoc->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->errcode = 0;
+ bsrr->hits = 0;
+ bsrr->errstring = NULL;
+ ((int (*)(void *, bend_search_rr *))(assoc->bend_search))
+ (assoc->backend, bsrr);
+ if (!bsrr->request)
+ return 0;
+ }
+ else
+ {
+ bend_searchrequest bsrq;
+ bend_searchresult *bsrt;
+
+ bsrq.setname = req->resultSetName;
+ bsrq.replace_set = *req->replaceIndicator;
+ bsrq.num_bases = req->num_databaseNames;
+ bsrq.basenames = req->databaseNames;
+ bsrq.query = req->query;
+ bsrq.referenceId = req->referenceId;
+ bsrq.stream = assoc->encode;
+ bsrq.decode = assoc->decode;
+ if (!(bsrt = bend_search (assoc->backend, &bsrq, fd)))
+ return 0;
+ bsrr->hits = bsrt->hits;
+ bsrr->errcode = bsrt->errcode;
+ bsrr->errstring = bsrt->errstring;
+ }
+ 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;
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- Z_SearchResponse *resp = odr_malloc (assoc->encode, sizeof(*resp));
- int *nulint = odr_malloc (assoc->encode, sizeof(*nulint));
- bool_t *sr = odr_malloc (assoc->encode, sizeof(*sr));
- int *next = odr_malloc (assoc->encode, sizeof(*next));
- int *none = odr_malloc (assoc->encode, sizeof(*none));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_SearchResponse *resp = (Z_SearchResponse *)
+ odr_malloc (assoc->encode, sizeof(*resp));
+ int *nulint = (int *)odr_malloc (assoc->encode, sizeof(*nulint));
+ bool_t *sr = (bool_t *)odr_malloc (assoc->encode, sizeof(*sr));
+ int *next = (int *)odr_malloc (assoc->encode, sizeof(*next));
+ int *none = (int *)odr_malloc (assoc->encode, sizeof(*none));
*nulint = 0;
*sr = 1;
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)
}
else
{
- int *toget = odr_malloc (assoc->encode, sizeof(*toget));
- int *presst = odr_malloc (assoc->encode, sizeof(*presst));
+ int *toget = (int *)odr_malloc (assoc->encode, sizeof(*toget));
+ int *presst = (int *)odr_malloc (assoc->encode, sizeof(*presst));
Z_RecordComposition comp, *compp = 0;
*toget = 0;
else
form = prefformat->value;
resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form);
+ toget, compp, next, presst, form, req->referenceId);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
int *fd)
{
Z_PresentRequest *req = reqb->request->u.presentRequest;
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- Z_PresentResponse *resp = odr_malloc (assoc->encode, sizeof(*resp));
- int *presst = odr_malloc (assoc->encode, sizeof(*presst));
- int *next = odr_malloc (assoc->encode, sizeof(*next));
- int *num = odr_malloc (assoc->encode, sizeof(*num));
oident *prefformat;
oid_value form;
+ Z_APDU *apdu;
+ Z_PresentResponse *resp;
+ int *presst;
+ int *next;
+ int *num;
- logf(LOG_LOG, "Got PresentRequest.");
- *presst = 0;
- *next = 0;
- *num = 0;
-
- apdu->which = Z_APDU_presentResponse;
- apdu->u.presentResponse = resp;
- resp->referenceId = req->referenceId;
- resp->otherInfo = 0;
+ yaz_log(LOG_LOG, "Got PresentRequest.");
if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
prefformat->oclass != CLASS_RECSYN)
form = VAL_NONE;
else
form = prefformat->value;
+ if (assoc->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->request = reqb;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ ((int (*)(void *, bend_present_rr *))(*assoc->bend_present))(
+ assoc->backend, bprr);
+
+ if (!bprr->request)
+ return 0;
+ }
+ apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
+ presst = (int *)odr_malloc (assoc->encode, sizeof(*presst));
+ next = (int *)odr_malloc (assoc->encode, sizeof(*next));
+ num = (int *)odr_malloc (assoc->encode, sizeof(*num));
+ *presst = 0;
+ *next = 0;
*num = *req->numberOfRecordsRequested;
- resp->records = pack_records(assoc, req->resultSetId,
- *req->resultSetStartPoint, num, req->recordComposition, next,
- presst, form);
+
+ apdu->which = Z_APDU_presentResponse;
+ apdu->u.presentResponse = resp;
+ resp->referenceId = req->referenceId;
+ resp->otherInfo = 0;
+
+ resp->records =
+ pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
+ num, req->recordComposition, next, presst, form,
+ req->referenceId);
if (!resp->records)
- return 0;
+ return 0;
resp->numberOfRecordsReturned = num;
resp->presentStatus = presst;
resp->nextResultSetPosition = next;
-
+
return apdu;
}
+static int bend_default_scan (void *handle, bend_scan_rr *rr)
+{
+ bend_scanrequest srq;
+ bend_scanresult *srs;
+
+ srq.num_bases = rr->num_bases;
+ srq.basenames = rr->basenames;
+ srq.attributeset = rr->attributeset;
+ srq.referenceId = rr->referenceId;
+ srq.term = rr->term;
+ srq.term_position = rr->term_position;
+ srq.num_entries = rr->num_entries;
+ srq.stream = rr->stream;
+
+ srs = bend_scan(handle, &srq, 0);
+
+ rr->term_position = srs->term_position;
+ rr->num_entries = srs->num_entries;
+ rr->entries = srs->entries;
+ rr->status = srs->status;
+ rr->errcode = srs->errcode;
+ rr->errstring = srs->errstring;
+ return 0;
+}
+
/*
* Scan was implemented rather in a hurry, and with support for only the basic
* elements of the service in the backend API. Suggestions are welcome.
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
Z_ScanRequest *req = reqb->request->u.scanRequest;
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- Z_ScanResponse *res = odr_malloc (assoc->encode, sizeof(*res));
- int *scanStatus = odr_malloc (assoc->encode, sizeof(*scanStatus));
- int *numberOfEntriesReturned =
- odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned));
- Z_ListEntries *ents = odr_malloc (assoc->encode, sizeof(*ents));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_ScanResponse *res = (Z_ScanResponse *)
+ odr_malloc (assoc->encode, sizeof(*res));
+ int *scanStatus = (int *)
+ odr_malloc (assoc->encode, sizeof(*scanStatus));
+ int *numberOfEntriesReturned = (int *)
+ odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned));
+ Z_ListEntries *ents = (Z_ListEntries *)
+ odr_malloc (assoc->encode, sizeof(*ents));
+ Z_DiagRecs *diagrecs_p = NULL;
oident *attent;
- bend_scanrequest srq;
- bend_scanresult *srs;
oident *attset;
- logf(LOG_LOG, "Got scanrequest");
+ yaz_log(LOG_LOG, "Got ScanRequest");
*scanStatus = Z_Scan_failure;
*numberOfEntriesReturned = 0;
res->numberOfEntriesReturned = numberOfEntriesReturned;
res->positionOfTerm = 0;
res->entries = ents;
- ents->which = Z_ListEntries_nonSurrogateDiagnostics;
+ ents->num_entries = 0;
+ ents->entries = NULL;
+ ents->num_nonsurrogateDiagnostics = 0;
+ ents->nonsurrogateDiagnostics = NULL;
res->attributeSet = 0;
res->otherInfo = 0;
if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
- attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1))
- ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 121, 0);
+ attent->oclass != CLASS_ATTSET
+ || attent->value != VAL_BIB1))
+ diagrecs_p = diagrecs(assoc, 121, 0);
else if (req->stepSize && *req->stepSize > 0)
- ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 205, 0);
+ diagrecs_p = diagrecs(assoc, 205, 0);
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;
+ bend_scan_rr *bsrr = (bend_scan_rr *)
+ odr_malloc (assoc->encode, sizeof(*bsrr));
+ 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;
if (!(attset = oid_getentbyoid(req->attributeSet)) ||
attset->oclass != CLASS_RECSYN)
- srq.attributeset = VAL_NONE;
+ bsrr->attributeset = VAL_NONE;
else
- srq.attributeset = attset->value;
- srq.term_position = req->preferredPositionInResponse ?
+ bsrr->attributeset = attset->value;
+ log_scan_term (req->termListAndStartPoint, attset->value);
+ bsrr->term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
- if (!(srs = bend_scan(assoc->backend, &srq, 0)))
- ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 2, 0);
- else if (srs->errcode)
- ents->u.nonSurrogateDiagnostics = diagrecs(assoc,
- srs->errcode, srs->errstring);
+ ((int (*)(void *, bend_scan_rr *))(*assoc->bend_scan))(assoc->backend,
+ bsrr);
+ if (bsrr->errcode)
+ diagrecs_p = diagrecs(assoc, bsrr->errcode, bsrr->errstring);
else
{
int i;
- Z_Entries *list = odr_malloc (assoc->encode, sizeof(*list));
- Z_Entry **tab = odr_malloc (assoc->encode,
- sizeof(*tab) * srs->num_entries);
-
- if (srs->status == BEND_SCAN_PARTIAL)
+ 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->which = Z_ListEntries_entries;
- ents->u.entries = list;
- list->entries = tab;
- for (i = 0; i < srs->num_entries; i++)
+ 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;
-
- 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->displayTerm = 0;
- t->alternativeTerm = 0;
- t->byAttributes = 0;
- t->otherTermInfo = 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);
+
+ 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];
+ }
}
- list->num_entries = i;
- res->numberOfEntriesReturned = &list->num_entries;
- res->positionOfTerm = &srs->term_position;
}
}
+ if (diagrecs_p)
+ {
+ ents->num_nonsurrogateDiagnostics = diagrecs_p->num_diagRecs;
+ ents->nonsurrogateDiagnostics = diagrecs_p->diagRecs;
+ }
+ return apdu;
+}
+
+static Z_APDU *process_sortRequest(association *assoc, request *reqb,
+ int *fd)
+{
+ Z_SortRequest *req = reqb->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.");
+
+#ifdef ASN_COMPILED
+ bsrr->num_input_setnames = req->num_inputResultSetNames;
+ bsrr->input_setnames = req->inputResultSetNames;
+#else
+ bsrr->num_input_setnames = req->inputResultSetNames->num_strings;
+ bsrr->input_setnames = req->inputResultSetNames->strings;
+#endif
+ bsrr->referenceId = req->referenceId;
+ bsrr->output_setname = req->sortedResultSetName;
+ bsrr->sort_sequence = req->sortSequence;
+ bsrr->stream = assoc->encode;
+
+ bsrr->sort_status = Z_SortStatus_failure;
+ bsrr->errcode = 0;
+ bsrr->errstring = 0;
+
+ ((int (*)(void *, bend_sort_rr *))(*assoc->bend_sort))(assoc->backend,
+ bsrr);
+
+ res->referenceId = bsrr->referenceId;
+ res->sortStatus = (int *)
+ odr_malloc (assoc->encode, sizeof(*res->sortStatus));
+ *res->sortStatus = bsrr->sort_status;
+ res->resultSetStatus = 0;
+ if (bsrr->errcode)
+ {
+ Z_DiagRecs *dr = diagrecs (assoc, bsrr->errcode, bsrr->errstring);
+#ifdef ASN_COMPILED
+ res->diagnostics = dr->diagRecs;
+ res->num_diagnostics = dr->num_diagRecs;
+#else
+ res->diagnostics = dr;
+#endif
+ }
+ else
+ {
+#ifdef ASN_COMPILED
+ res->num_diagnostics = 0;
+#endif
+ res->diagnostics = 0;
+ }
+ res->otherInfo = 0;
+
+ apdu->which = Z_APDU_sortResponse;
+ apdu->u.sortResponse = res;
+ return apdu;
+}
+
+static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
+ int *fd)
+{
+ Z_DeleteResultSetRequest *req = reqb->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->function = *req->deleteFunction;
+ bdrr->referenceId = req->referenceId;
+ bdrr->statuses = 0;
+ if (bdrr->num_setnames > 0)
+ {
+ int i;
+ bdrr->statuses = odr_malloc(assoc->encode, sizeof(*bdrr->statuses) *
+ bdrr->num_setnames);
+ for (i = 0; i < bdrr->num_setnames; i++)
+ bdrr->statuses[i] = 0;
+ }
+ ((int (*)(void *, bend_delete_rr *))
+ (*assoc->bend_delete))(assoc->backend, bdrr);
+
+ res->referenceId = req->referenceId;
+
+ res->deleteOperationStatus = (int *)
+ odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus));
+ *res->deleteOperationStatus = bdrr->delete_status;
+
+ res->deleteListStatuses = 0;
+ if (bdrr->num_setnames > 0)
+ {
+ int i;
+ res->deleteListStatuses = odr_malloc(assoc->encode,
+ sizeof(*res->deleteListStatuses));
+ res->deleteListStatuses->num = bdrr->num_setnames;
+ res->deleteListStatuses->elements =
+ odr_malloc (assoc->encode,
+ sizeof(*res->deleteListStatuses->elements) *
+ bdrr->num_setnames);
+ for (i = 0; i<bdrr->num_setnames; i++)
+ {
+ res->deleteListStatuses->elements[i] =
+ 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;
+ apdu->which = Z_APDU_deleteResultSetResponse;
+ apdu->u.deleteResultSetResponse = res;
return apdu;
}
"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_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_request (a, req, &msg);
+ if (r < 0)
+ logf (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_ESRequest(association *assoc, request *reqb, int *fd)
+{
+ bend_esrequest_rr esrequest;
+
+ Z_ExtendedServicesRequest *req = reqb->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->request->u.extendedServicesRequest;
+ esrequest.stream = assoc->encode;
+ esrequest.decode = assoc->decode;
+ esrequest.errcode = 0;
+ esrequest.errstring = NULL;
+ esrequest.request = reqb;
+ esrequest.association = assoc;
+ esrequest.referenceId = req->referenceId;
+
+ ((int (*)(void *, bend_esrequest_rr *))(*assoc->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 */
+
+ yaz_log(LOG_DEBUG,"Send the result apdu");
+ return apdu;
}
projects / yaz-moved-to-github.git / blobdiff