/*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: seshigh.c,v $
- * 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.
- *
- * Revision 1.64 1997/04/30 08:52:11 quinn
- * Null
- *
- * Revision 1.63 1996/10/11 11:57:26 quinn
- * Smallish
- *
- * Revision 1.62 1996/07/06 19:58:35 quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.61 1996/06/10 08:56:16 quinn
- * Work on Summary.
- *
- * Revision 1.60 1996/05/30 11:03:10 quinn
- * Fixed NextresultSetPosition bug fixed.
- *
- * Revision 1.59 1996/05/14 09:26:46 quinn
- * Added attribute set to scan backend
- *
- * Revision 1.58 1996/02/20 12:53:04 quinn
- * Chanes to SCAN
- *
- * Revision 1.57 1996/01/02 08:57:47 quinn
- * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
- *
- * Revision 1.56 1995/12/14 11:09:57 quinn
- * Work on Explain
- *
- * Revision 1.55 1995/11/08 17:41:37 quinn
- * Smallish.
- *
- * 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.121 2001-11-13 23:00: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 <yconfig.h>
#include <stdlib.h>
#include <stdio.h>
#ifdef WIN32
#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 <logrpn.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, request *req);
+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);
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;
control_block = statserv_getcontrol();
if (!(anew = (association *)xmalloc(sizeof(*anew))))
return 0;
+ 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;
*/
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));
request_delq(&h->incoming);
}
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))
{
yaz_log(LOG_DEBUG, "ir_session (input)");
- assert(assoc && conn);
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
iochan_destroy(h);
return;
}
+ assoc->cs_get_mask = EVENT_INPUT;
if ((res = cs_get(conn, &assoc->input_buffer,
&assoc->input_buffer_len)) <= 0)
{
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);
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, 0))
+ if (!z_APDU(assoc->decode, &req->apdu_request, 0, 0))
{
yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
- odr_errmsg(odr_geterror(assoc->decode)),
- odr_offset(assoc->decode));
+ odr_errmsg(odr_geterror(assoc->decode)),
+ odr_offset(assoc->decode));
yaz_log(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(), assoc->input_buffer, res);
+ odr_dumpBER(yaz_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, 0))
+ if (assoc->print && !z_APDU(assoc->print, &req->apdu_request, 0, 0))
{
yaz_log(LOG_WARN, "ODR print error: %s",
odr_errmsg(odr_geterror(assoc->print)));
req = request_head(&assoc->incoming);
if (req->state == REQUEST_IDLE)
{
+ char *msg;
request_deq(&assoc->incoming);
- if (process_request(assoc, req) < 0)
- do_close_req(assoc, Z_Close_systemProblem, "Unknown error",
- req);
+ if (process_request(assoc, req, &msg) < 0)
+ do_close_req(assoc, Z_Close_systemProblem, msg, req);
}
}
- if (event & EVENT_OUTPUT)
+ if (event & assoc->cs_put_mask)
{
request *req = request_head(&assoc->outgoing);
+ 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:
- 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);
- nmem_destroy(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);
+ 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);
+ }
+ 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)
{
- yaz_log(LOG_DEBUG, "ir_session (exception)");
+ yaz_log(LOG_LOG, "ir_session (exception)");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
/*
* Initiate request processing.
*/
-static int process_request(association *assoc, request *req)
+static int process_request(association *assoc, request *req, char **msg)
{
int fd = -1;
Z_APDU *res;
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_extendedServicesRequest:
- if (assoc->bend_esrequest)
- res = process_ESRequest(assoc, req, &fd);
- else
- {
- yaz_log(LOG_WARN, "Cannot handle EXTENDED SERVICES APDU");
- return -1;
- }
- break;
- case Z_APDU_sortRequest:
- if (assoc->bend_sort)
- res = process_sortRequest(assoc, req, &fd);
- else
- {
- yaz_log(LOG_WARN, "Cannot handle SORT APDU");
- return -1;
- }
- break;
- case Z_APDU_close:
- process_close(assoc, req); return 0;
- case Z_APDU_deleteResultSetRequest:
- if (assoc->bend_delete)
- res = process_deleteRequest(assoc, req, &fd);
- else
- {
- yaz_log (LOG_WARN, "Cannot handle Delete APDU");
- return -1;
- }
- break;
- default:
- yaz_log(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)
{
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;
static int process_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))
+ {
+ yaz_log(LOG_WARN, "ODR print error: %s",
+ odr_errmsg(odr_geterror(assoc->print)));
+ odr_reset(assoc->print);
+ }
if (!z_APDU(assoc->encode, &res, 0, 0))
{
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 */
- if (assoc->print && !z_APDU(assoc->print, &res, 0, 0))
- {
- yaz_log(LOG_WARN, "ODR print error: %s",
- odr_errmsg(odr_geterror(assoc->print)));
- odr_reset(assoc->print);
- }
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))
*/
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];
+ xfree (assoc->init);
+ assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init));
+
yaz_log(LOG_LOG, "Got initRequest");
if (req->implementationId)
yaz_log(LOG_LOG, "Id: %s", req->implementationId);
if (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;
- if (!(binitres = bend_init(&binitreq)))
+ 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_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->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;
- if ((assoc->bend_sort = (int (*)())binitreq.bend_sort))
+ if ((assoc->init->bend_sort))
yaz_log (LOG_DEBUG, "Sort handler installed");
- if ((assoc->bend_search = (int (*)())binitreq.bend_search))
+ if ((assoc->init->bend_search))
yaz_log (LOG_DEBUG, "Search handler installed");
- if ((assoc->bend_present = (int (*)())binitreq.bend_present))
+ if ((assoc->init->bend_present))
yaz_log (LOG_DEBUG, "Present handler installed");
- if ((assoc->bend_esrequest = (int (*)())binitreq.bend_esrequest))
+ if ((assoc->init->bend_esrequest))
yaz_log (LOG_DEBUG, "ESRequest handler installed");
- if ((assoc->bend_delete = (int (*)())binitreq.bend_delete))
+ 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';
ODR_MASK_SET(resp->options, Z_Options_present);
strcat(options, " prst");
}
- if (ODR_MASK_GET(req->options, Z_Options_delSet) && binitreq.bend_delete)
+ if (ODR_MASK_GET(req->options, Z_Options_delSet) &&
+ assoc->init->bend_delete)
{
ODR_MASK_SET(resp->options, Z_Options_delSet);
strcat(options, " del");
}
if (ODR_MASK_GET(req->options, Z_Options_extendedServices) &&
- binitreq.bend_esrequest)
+ assoc->init->bend_esrequest)
{
ODR_MASK_SET(resp->options, Z_Options_extendedServices);
strcat (options, " extendedServices");
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");
ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
strcat(options, " concurop");
}
- if (ODR_MASK_GET(req->options, Z_Options_sort) && binitreq.bend_sort)
+ if (ODR_MASK_GET(req->options, Z_Options_sort) && assoc->init->bend_sort)
{
ODR_MASK_SET(resp->options, Z_Options_sort);
strcat(options, " sort");
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 (binitreq.implementation_name)
+ if (assoc->init->implementation_name)
{
char *nv = (char *)
odr_malloc (assoc->encode,
- strlen(binitreq.implementation_name) + 3 +
+ strlen(assoc->init->implementation_name) + 10 +
strlen(resp->implementationName));
- sprintf (nv, "%s %s",
- resp->implementationName, binitreq.implementation_name);
+ sprintf (nv, "%s / %s",
+ resp->implementationName, assoc->init->implementation_name);
resp->implementationName = nv;
}
- if (binitreq.implementation_version)
+ if (assoc->init->implementation_version)
{
char *nv = (char *)
odr_malloc (assoc->encode,
- strlen(binitreq.implementation_version) + 3 +
+ strlen(assoc->init->implementation_version) + 10 +
strlen(resp->implementationVersion));
- sprintf (nv, "%s %s",
- resp->implementationVersion, binitreq.implementation_version);
+ sprintf (nv, "YAZ %s / %s",
+ resp->implementationVersion,
+ assoc->init->implementation_version);
resp->implementationVersion = nv;
}
* These functions should be merged.
*/
-static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo)
+static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo, ODR odr)
{
-#if ASN_COMPILED
dr->which = Z_DefaultDiagFormat_v2Addinfo;
- dr->u.v2Addinfo = addinfo ? addinfo : "";
-#else
- dr->which = Z_DiagForm_v2AddInfo;
- dr->addinfo = addinfo ? addinfo : "";
-#endif
+ dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
}
/*
*/
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
- int oid[OID_SIZE];
Z_Records *rec = (Z_Records *)
odr_malloc (assoc->encode, sizeof(*rec));
- oident bib1;
- int *err = (int *)
- odr_malloc (assoc->encode, sizeof(*err));
+ 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));
- bib1.proto = assoc->proto;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
yaz_log(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
"NULL");
- *err = error;
rec->which = Z_Records_NSD;
-#if ASN_COMPILED
rec->u.nonSurrogateDiagnostic = dr;
-#else
- rec->u.nonSurrogateDiagnostic = drec;
- drec->which = Z_DiagRec_defaultFormat;
- drec->u.defaultFormat = dr;
-#endif
dr->diagnosticSetId =
- odr_oiddup (assoc->encode, oid_ent_to_oid(&bib1, oid));
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
dr->condition = err;
- set_addinfo (dr, addinfo);
+ set_addinfo (dr, addinfo, assoc->encode);
return rec;
}
static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname,
int error, char *addinfo)
{
- 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;
+ 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));
- bib1.proto = assoc->proto;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
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 = odr_oiddup (assoc->encode,
- oid_ent_to_oid(&bib1, oid));
+ dr->diagnosticSetId =
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
dr->condition = err;
- set_addinfo (dr, addinfo);
+ set_addinfo (dr, addinfo, assoc->encode);
return rec;
}
*/
static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo)
{
- 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;
+ 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));
+ Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)
+ odr_malloc (assoc->encode, sizeof(*rec));
yaz_log(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : "");
- bib1.proto = assoc->proto;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
- *err = error;
recs->num_diagRecs = 1;
recs->diagRecs = recp;
recp[0] = drec;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = rec;
- rec->diagnosticSetId = odr_oiddup (assoc->encode,
- oid_ent_to_oid(&bib1, oid));
+ rec->diagnosticSetId =
+ yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1);
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
+ rec->u.v2Addinfo = odr_strdup (assoc->encode, addinfo ? addinfo : "");
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,
- Z_ReferenceId *referenceId)
+ int *num, Z_RecordComposition *comp,
+ int *next, int *pres, oid_value format,
+ Z_ReferenceId *referenceId,
+ int *oid)
{
int recno, total_length = 0, toget = *num, dumped_records = 0;
Z_Records *records =
a->maximumRecordSize);
for (recno = start; reclist->num_records < toget; recno++)
{
- bend_fetchrequest freq;
- bend_fetchresult *fres;
+ bend_fetch_rr freq;
Z_NamePlusRecord *thisrec;
int this_length = 0;
/*
* idea of the total size of the data so far.
*/
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;
+ freq.print = a->print;
freq.surrogate_flag = 0;
freq.referenceId = referenceId;
- if (!(fres = bend_fetch(a->backend, &freq, 0)))
- {
- *pres = Z_PRES_FAILURE;
- return diagrec(a, 2, "Backend interface problem");
- }
+ (*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)
{
if (!freq.surrogate_flag)
{
*pres = Z_PRES_FAILURE;
- return diagrec(a, fres->errcode, fres->errstring);
+ return diagrec(a, freq.errcode, freq.errstring);
}
reclist->records[reclist->num_records] =
- surrogatediagrec(a, fres->basename, fres->errcode,
- fres->errstring);
+ surrogatediagrec(a, freq.basename, freq.errcode,
+ freq.errstring);
reclist->num_records++;
- *next = fres->last_in_set ? 0 : recno + 1;
+ *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;
yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d",
{
yaz_log(LOG_DEBUG, " Dropped it");
reclist->records[reclist->num_records] =
- surrogatediagrec(a, fres->basename, 16, 0);
+ surrogatediagrec(a, freq.basename, 16, 0);
reclist->num_records++;
- *next = fres->last_in_set ? 0 : recno + 1;
+ *next = freq.last_in_set ? 0 : recno + 1;
dumped_records += this_length;
continue;
}
{
yaz_log(LOG_DEBUG, "Record > maxrcdsz");
reclist->records[reclist->num_records] =
- surrogatediagrec(a, fres->basename, 17, 0);
+ surrogatediagrec(a, freq.basename, 17, 0);
reclist->num_records++;
- *next = fres->last_in_set ? 0 : recno + 1;
+ *next = freq.last_in_set ? 0 : recno + 1;
dumped_records += this_length;
continue;
}
odr_malloc(a->encode, sizeof(*thisrec))))
return 0;
if (!(thisrec->databaseName = (char *)odr_malloc(a->encode,
- strlen(fres->basename) + 1)))
+ strlen(freq.basename) + 1)))
return 0;
- strcpy(thisrec->databaseName, fres->basename);
+ strcpy(thisrec->databaseName, freq.basename);
thisrec->which = Z_NamePlusRecord_databaseRecord;
- thisrec->u.databaseRecord = z_ext_record(a->encode, fres->format,
- fres->record, fres->len);
+
+ if (freq.output_format_raw)
+ {
+ struct oident *ident = oid_getentbyoid(freq.output_format_raw);
+ freq.output_format = ident->value;
+ }
+ thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format,
+ freq.record, freq.len);
if (!thisrec->u.databaseRecord)
return 0;
reclist->records[reclist->num_records] = thisrec;
reclist->num_records++;
- *next = fres->last_in_set ? 0 : recno + 1;
+ *next = freq.last_in_set ? 0 : recno + 1;
}
*num = reclist->num_records;
return records;
static Z_APDU *process_searchRequest(association *assoc, request *reqb,
int *fd)
{
- Z_SearchRequest *req = reqb->request->u.searchRequest;
+ Z_SearchRequest *req = reqb->apdu_request->u.searchRequest;
bend_search_rr *bsrr =
(bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr));
case Z_Query_type_1: case Z_Query_type_101:
log_rpn_query (req->query->u.type_1);
}
- if (assoc->bend_search)
+ if (assoc->init->bend_search)
{
bsrr->setname = req->resultSetName;
bsrr->replace_set = *req->replaceIndicator;
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;
- ((int (*)(void *, bend_search_rr *))(assoc->bend_search))
- (assoc->backend, bsrr);
+ (assoc->init->bend_search)(assoc->backend, bsrr);
if (!bsrr->request)
return 0;
}
+#if 0
else
{
bend_searchrequest bsrq;
bsrq.referenceId = req->referenceId;
bsrq.stream = assoc->encode;
bsrq.decode = assoc->decode;
+ bsrq.print = assoc->print;
if (!(bsrt = bend_search (assoc->backend, &bsrq, fd)))
return 0;
bsrr->hits = bsrt->hits;
bsrr->errcode = bsrt->errcode;
bsrr->errstring = bsrt->errstring;
}
+#endif
return response_searchRequest(assoc, reqb, bsrr, fd);
}
static Z_APDU *response_searchRequest(association *assoc, request *reqb,
bend_search_rr *bsrt, int *fd)
{
- Z_SearchRequest *req = reqb->request->u.searchRequest;
+ 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 = (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;
- *next = 0;
- *none = Z_RES_NONE;
+ 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;
}
else
{
- int *toget = (int *)odr_malloc (assoc->encode, sizeof(*toget));
- int *presst = (int *)odr_malloc (assoc->encode, sizeof(*presst));
+ int *toget = odr_intdup(assoc->encode, 0);
+ int *presst = odr_intdup(assoc->encode, 0);
Z_RecordComposition comp, *compp = 0;
- *toget = 0;
- *presst = 0;
resp->records = 0;
resp->resultCount = &bsrt->hits;
oident *prefformat;
oid_value form;
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
- prefformat->oclass != 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, req->referenceId);
+ toget, compp, next, presst, form, req->referenceId,
+ req->preferredRecordSyntax);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
* 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;
+ Z_PresentRequest *req = reqb->apdu_request->u.presentRequest;
oident *prefformat;
oid_value form;
Z_APDU *apdu;
Z_PresentResponse *resp;
- int *presst;
int *next;
int *num;
yaz_log(LOG_LOG, "Got PresentRequest.");
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
- prefformat->oclass != CLASS_RECSYN)
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
form = VAL_NONE;
else
form = prefformat->value;
- if (assoc->bend_present)
+ 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->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;
- ((int (*)(void *, bend_present_rr *))(*assoc->bend_present))(
- assoc->backend, bprr);
+ (*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));
- 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;
+ 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;
- resp->records =
- pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
- num, req->recordComposition, next, presst, form,
- req->referenceId);
+ 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->presentStatus = presst;
resp->nextResultSetPosition = next;
return apdu;
*/
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
- Z_ScanRequest *req = reqb->request->u.scanRequest;
+ 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 = (int *)
- odr_malloc (assoc->encode, sizeof(*scanStatus));
- int *numberOfEntriesReturned = (int *)
- odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned));
+ 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 *attent;
- bend_scanrequest srq;
- bend_scanresult *srs;
oident *attset;
yaz_log(LOG_LOG, "Got ScanRequest");
- *scanStatus = Z_Scan_failure;
- *numberOfEntriesReturned = 0;
apdu->which = Z_APDU_scanResponse;
apdu->u.scanResponse = res;
res->referenceId = req->referenceId;
- res->stepSize = 0;
+ res->stepSize = odr_intdup(assoc->encode, 0);
+
+ if (req->stepSize)
+ *res->stepSize = *req->stepSize;
res->scanStatus = scanStatus;
res->numberOfEntriesReturned = numberOfEntriesReturned;
res->positionOfTerm = 0;
diagrecs_p = diagrecs(assoc, 205, 0);
else
{
+ 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]);
}
- srq.num_bases = req->num_databaseNames;
- srq.basenames = req->databaseNames;
- srq.num_entries = *req->numberOfTermsRequested;
- srq.term = req->termListAndStartPoint;
- srq.referenceId = req->referenceId;
- srq.stream = assoc->encode;
+ 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 (!(attset = oid_getentbyoid(req->attributeSet)) ||
attset->oclass != CLASS_RECSYN)
- srq.attributeset = VAL_NONE;
+ bsrr->attributeset = VAL_NONE;
else
- srq.attributeset = attset->value;
- log_scan_term (req->termListAndStartPoint, attset->value);
- srq.term_position = req->preferredPositionInResponse ?
+ bsrr->attributeset = attset->value;
+ log_scan_term (req->termListAndStartPoint, bsrr->attributeset);
+ bsrr->term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
- if (!(srs = bend_scan(assoc->backend, &srq, 0)))
- diagrecs_p = diagrecs(assoc, 2, 0);
- else if (srs->errcode)
- diagrecs_p = diagrecs(assoc, srs->errcode, srs->errstring);
+ ((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) * srs->num_entries);
+ odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries);
- if (srs->status == BEND_SCAN_PARTIAL)
+ if (bsrr->status == BEND_SCAN_PARTIAL)
*scanStatus = Z_Scan_partial_5;
else
*scanStatus = Z_Scan_success;
ents->entries = tab;
- ents->num_entries = srs->num_entries;
+ ents->num_entries = bsrr->num_entries;
res->numberOfEntriesReturned = &ents->num_entries;
- res->positionOfTerm = &srs->term_position;
- for (i = 0; i < srs->num_entries; i++)
+ 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 (srs->entries[i].occurrences >= 0)
+ if (bsrr->entries[i].occurrences >= 0)
{
e->which = Z_Entry_termInfo;
e->u.termInfo = t = (Z_TermInfo *)
t->alternativeTerm = 0;
t->byAttributes = 0;
t->otherTermInfo = 0;
- t->globalOccurrences = &srs->entries[i].occurrences;
+ t->globalOccurrences = &bsrr->entries[i].occurrences;
t->term = (Z_Term *)
odr_malloc(assoc->encode, sizeof(*t->term));
t->term->which = Z_Term_general;
(Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct));
o->buf = (unsigned char *)
odr_malloc(assoc->encode, o->len = o->size =
- strlen(srs->entries[i].term));
- memcpy(o->buf, srs->entries[i].term, o->len);
+ strlen(bsrr->entries[i].term));
+ memcpy(o->buf, bsrr->entries[i].term, o->len);
yaz_log(LOG_DEBUG, " term #%d: '%s' (%d)", i,
- srs->entries[i].term, srs->entries[i].occurrences);
+ bsrr->entries[i].term, bsrr->entries[i].occurrences);
}
else
{
Z_DiagRecs *drecs = diagrecs (assoc,
- srs->entries[i].errcode,
- srs->entries[i].errstring);
+ bsrr->entries[i].errcode,
+ bsrr->entries[i].errstring);
assert (drecs->num_diagRecs == 1);
e->which = Z_Entry_surrogateDiagnostic;
assert (drecs->diagRecs[0]);
static Z_APDU *process_sortRequest(association *assoc, request *reqb,
int *fd)
{
- Z_SortRequest *req = reqb->request->u.sortRequest;
+ 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 *)
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->print = assoc->print;
bsrr->sort_status = Z_SortStatus_failure;
bsrr->errcode = 0;
bsrr->errstring = 0;
- ((int (*)(void *, bend_sort_rr *))(*assoc->bend_sort))(assoc->backend,
- bsrr);
+ (*assoc->init->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->sortStatus = odr_intdup(assoc->encode, 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;
static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
int *fd)
{
- Z_DeleteResultSetRequest *req = reqb->request->u.deleteResultSetRequest;
+ 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 *)
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;
-
- ((int (*)(void *, bend_delete_rr *))
- (*assoc->bend_delete))(assoc->backend, bdrr);
+ 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 = (int *)
- odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus));
- *res->deleteOperationStatus = bdrr->delete_status;
+ 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;
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",
int bend_backend_respond (bend_association a, bend_request req)
{
- return process_request (a, 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)
return r->clientData;
}
+static Z_APDU *process_segmentRequest (association *assoc, request *reqb)
+{
+ bend_segment_rr request;
+
+ request.segment = reqb->apdu_request->u.segmentRequest;
+ request.stream = assoc->encode;
+ request.decode = assoc->decode;
+ request.print = assoc->print;
+ request.association = assoc;
+
+ (*assoc->init->bend_segment)(assoc->backend, &request);
+
+ return 0;
+}
+
static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
{
bend_esrequest_rr esrequest;
- Z_ExtendedServicesRequest *req = reqb->request->u.extendedServicesRequest;
+ 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->request->u.extendedServicesRequest;
+ 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;
- ((int (*)(void *, bend_esrequest_rr *))(*assoc->bend_esrequest))
- (assoc->backend, &esrequest);
+ (*assoc->init->bend_esrequest)(assoc->backend, &esrequest);
/* If the response is being delayed, return NULL */
if (esrequest.request == NULL)
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