X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=ba966981a26dbefdb42ac591fdd2a332b58f2d2c;hp=a2f4c357cd1c2577e4f88a8448402ebef36e6d1a;hb=df869b93d7eb00d07ffcd27556af94b00c518ad9;hpb=c7dfadc3347abda902e15f79bfd513e1d48cfbba diff --git a/server/seshigh.c b/server/seshigh.c index a2f4c35..ba96698 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,375 +1,8 @@ /* - * Copyright (c) 1995-2001, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Log: seshigh.c,v $ - * Revision 1.119 2001-09-24 21:51:55 adam - * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid - * and yaz_z3950oid_to_str. - * - * Revision 1.118 2001/07/19 19:51:41 adam - * Added typecasts to make C++ happy. - * - * Revision 1.117 2001/06/13 20:47:40 adam - * When error is returned from present handler, non-surrogate diagnostic - * is returned in present response (and fetch handler is no longer called). - * - * Revision 1.116 2001/05/16 07:21:36 adam - * Accept any OID for record syntax. - * - * Revision 1.115 2001/03/25 21:55:12 adam - * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. - * - * Revision 1.114 2001/02/21 13:46:53 adam - * C++ fixes. - * - * Revision 1.113 2001/01/30 21:34:17 adam - * Added step-size for Scan backend interface. - * - * Revision 1.112 2001/01/29 09:38:22 adam - * Fixed bug that made the frontend server crash when no attribute set - * was specified for scan. - * - * Revision 1.111 2000/11/23 10:58:32 adam - * SSL comstack support. Separate POSIX thread support library. - * - * Revision 1.110 2000/10/02 13:05:32 adam - * Fixed bug introduced by previous commit. - * - * Revision 1.109 2000/10/02 11:07:44 adam - * Added peer_name member for bend_init handler. Changed the YAZ - * client so that tcp: can be avoided in target spec. - * - * Revision 1.108 2000/09/04 08:58:15 adam - * Added prefix yaz_ for most logging utility functions. - * - * Revision 1.107 2000/08/31 10:20:12 adam - * Added member request_format and output_format for backend fetch method. - * - * Revision 1.106 2000/08/31 09:51:25 adam - * Added record_syntax member for fetch method (raw OID). - * - * Revision 1.105 2000/07/06 10:38:47 adam - * Enhanced option --enable-tcpd. - * - * Revision 1.104 2000/04/05 07:39:55 adam - * Added shared library support (libtool). - * - * Revision 1.103 2000/03/20 19:06:25 adam - * Added Segment request for fronend server. Work on admin for client. - * - * Revision 1.102 2000/03/15 12:59:49 adam - * Added handle member to statserv_control. - * - * Revision 1.101 2000/01/12 14:36:07 adam - * Added printing stream (ODR) for backend functions. - * - * 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. - * - * 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.142 2003-02-18 14:47:23 adam Exp $ */ /* @@ -391,21 +24,18 @@ * 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 #include +#include #ifdef WIN32 +#include +#define S_ISREG(x) (x & _S_IFREG) #include +#include #else +#include #include #endif #include @@ -420,12 +50,19 @@ #include #include #include +#include +#include +#include +#include +#include #include -static int process_request(association *assoc, request *req, char **msg); +static void process_gdu_request(association *assoc, request *req); +static int process_z_request(association *assoc, request *req, char **msg); void backend_response(IOCHAN i, int event); -static int process_response(association *assoc, request *req, Z_APDU *res); +static int process_gdu_response(association *assoc, request *req, Z_GDU *res); +static int process_z_response(association *assoc, request *req, Z_APDU *res); static Z_APDU *process_initRequest(association *assoc, request *reqb); static Z_APDU *process_searchRequest(association *assoc, request *reqb, int *fd); @@ -444,9 +81,7 @@ 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; -/* 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. @@ -479,7 +114,11 @@ association *create_association(IOCHAN channel, COMSTACK link) strcpy(filename, control_block->apdufile); if (!(anew->print = odr_createmem(ODR_PRINT))) return 0; - if (*control_block->apdufile != '-') + if (*control_block->apdufile == '@') + { + odr_setprint(anew->print, yaz_log_file()); + } + else if (*control_block->apdufile != '-') { strcpy(filename, control_block->apdufile); if (!control_block->dynamic) @@ -541,8 +180,11 @@ void destroy_association(association *h) request_delq(&h->incoming); request_delq(&h->outgoing); xfree(h); + xmalloc_trav("session closed"); if (control_block && control_block->one_shot) + { exit (0); + } } static void do_close_req(association *a, int reason, char *message, @@ -562,8 +204,8 @@ static void do_close_req(association *a, int reason, char *message, apdu.u.close = cls; *cls->closeReason = reason; cls->diagnosticInformation = message; - process_response(a, req, &apdu); - iochan_settimeout(a->client_chan, 60); + process_z_response(a, req, &apdu); + iochan_settimeout(a->client_chan, 20); } else { @@ -645,7 +287,7 @@ void ir_session(IOCHAN h, int event) /* We aren't speaking to this fellow */ if (assoc->state == ASSOC_DEAD) { - yaz_log(LOG_LOG, "Closed connection after reject"); + yaz_log(LOG_LOG, "Connection closed - end of session"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -672,22 +314,34 @@ void ir_session(IOCHAN h, int event) iochan_setevent(h, EVENT_INPUT); /* we got a complete PDU. Let's decode it */ - yaz_log(LOG_DEBUG, "Got PDU, %d bytes", res); + yaz_log(LOG_DEBUG, "Got PDU, %d bytes: lead=%02X %02X %02X", res, + assoc->input_buffer[0] & 0xff, + assoc->input_buffer[1] & 0xff, + assoc->input_buffer[2] & 0xff); req = request_get(&assoc->incoming); /* get a new request structure */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); - if (!z_APDU(assoc->decode, &req->apdu_request, 0, 0)) + if (!z_GDU(assoc->decode, &req->gdu_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)); - yaz_log(LOG_LOG, "PDU dump:"); - odr_dumpBER(yaz_log_file(), assoc->input_buffer, res); - do_close(assoc, Z_Close_protocolError, "Malformed package"); + if (assoc->decode->error != OHTTP) + { + yaz_log(LOG_LOG, "PDU dump:"); + odr_dumpBER(yaz_log_file(), assoc->input_buffer, res); + do_close(assoc, Z_Close_protocolError, "Malformed package"); + } + else + { + Z_GDU *p = z_get_HTTP_Response(assoc->encode, 400); + assoc->state = ASSOC_DEAD; + process_gdu_response(assoc, req, p); + } return; } req->request_mem = odr_extract_mem(assoc->decode); - if (assoc->print && !z_APDU(assoc->print, &req->apdu_request, 0, 0)) + if (assoc->print && !z_GDU(assoc->print, &req->gdu_request, 0, 0)) { yaz_log(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); @@ -700,10 +354,8 @@ void ir_session(IOCHAN h, int event) req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) { - char *msg; request_deq(&assoc->incoming); - if (process_request(assoc, req, &msg) < 0) - do_close_req(assoc, Z_Close_systemProblem, msg, req); + process_gdu_request(assoc, req); } } if (event & assoc->cs_put_mask) @@ -712,7 +364,7 @@ void ir_session(IOCHAN h, int event) assoc->cs_put_mask = 0; yaz_log(LOG_DEBUG, "ir_session (output)"); - req->state = REQUEST_PENDING; + req->state = REQUEST_PENDING; switch (res = cs_put(conn, req->response, req->len_response)) { case -1: @@ -723,6 +375,10 @@ void ir_session(IOCHAN h, int event) break; case 0: /* all sent - release the request structure */ yaz_log(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response); +#if 0 + yaz_log(LOG_DEBUG, "HTTP out:\n%.*s", req->len_response, + req->response); +#endif nmem_destroy(req->request_mem); request_deq(&assoc->outgoing); request_release(req); @@ -730,7 +386,13 @@ void ir_session(IOCHAN h, int event) { /* restore mask for cs_get operation ... */ iochan_clearflag(h, EVENT_OUTPUT|EVENT_INPUT); iochan_setflag(h, assoc->cs_get_mask); + if (assoc->state == ASSOC_DEAD) + iochan_setevent(assoc->client_chan, EVENT_TIMEOUT); } + else + { + assoc->cs_put_mask = EVENT_OUTPUT; + } break; default: if (conn->io_pending & CS_WANT_WRITE) @@ -749,10 +411,431 @@ void ir_session(IOCHAN h, int event) } } +static int process_z_request(association *assoc, request *req, char **msg); + +static int srw_bend_init(association *assoc) +{ + bend_initresult *binitres; + statserv_options_block *cb = statserv_getcontrol(); + + assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); + + assoc->init->stream = assoc->encode; + assoc->init->print = assoc->print; + assoc->init->auth = 0; + assoc->init->referenceId = 0; + assoc->init->implementation_version = 0; + assoc->init->implementation_id = 0; + assoc->init->implementation_name = 0; + assoc->init->bend_sort = NULL; + assoc->init->bend_search = NULL; + assoc->init->bend_present = NULL; + assoc->init->bend_esrequest = NULL; + assoc->init->bend_delete = NULL; + assoc->init->bend_scan = NULL; + assoc->init->bend_segment = NULL; + assoc->init->bend_fetch = NULL; + assoc->init->charneg_request = NULL; + assoc->init->charneg_response = NULL; + assoc->init->decode = assoc->decode; + + assoc->init->peer_name = + odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); + if (!(binitres = (*cb->bend_init)(assoc->init))) + { + yaz_log(LOG_WARN, "Bad response from backend."); + return 0; + } + assoc->backend = binitres->handle; + return 1; +} + +static void srw_bend_fetch(association *assoc, int pos, + Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_record *record) +{ + bend_fetch_rr rr; + ODR o = assoc->encode; + + rr.setname = "default"; + rr.number = pos; + rr.referenceId = 0; + rr.request_format = VAL_TEXT_XML; + rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode, + CLASS_TRANSYN, + VAL_TEXT_XML); + rr.comp = (Z_RecordComposition *) + odr_malloc(assoc->decode, sizeof(*rr.comp)); + rr.comp->which = Z_RecordComp_complex; + rr.comp->u.complex = (Z_CompSpec *) + odr_malloc(assoc->decode, sizeof(Z_CompSpec)); + rr.comp->u.complex->selectAlternativeSyntax = (bool_t *) + odr_malloc(assoc->encode, sizeof(bool_t)); + *rr.comp->u.complex->selectAlternativeSyntax = 0; + rr.comp->u.complex->num_dbSpecific = 0; + rr.comp->u.complex->dbSpecific = 0; + rr.comp->u.complex->num_recordSyntax = 0; + rr.comp->u.complex->recordSyntax = 0; + + rr.comp->u.complex->generic = (Z_Specification *) + odr_malloc(assoc->decode, sizeof(Z_Specification)); + rr.comp->u.complex->generic->which = Z_Schema_uri; + rr.comp->u.complex->generic->schema.uri = srw_req->recordSchema; + rr.comp->u.complex->generic->elementSpec = 0; + + rr.stream = assoc->encode; + rr.print = assoc->print; + + rr.basename = 0; + rr.len = 0; + rr.record = 0; + rr.last_in_set = 0; + rr.output_format = VAL_TEXT_XML; + rr.output_format_raw = 0; + rr.errcode = 0; + rr.errstring = 0; + rr.surrogate_flag = 0; + + (*assoc->init->bend_fetch)(assoc->backend, &rr); + + if (rr.len >= 0) + { + record->recordData_buf = rr.record; + record->recordData_len = rr.len; + record->recordPosition = odr_intdup(o, pos); + record->recordSchema = 0; + if (srw_req->recordSchema) + record->recordSchema = odr_strdup(o, srw_req->recordSchema); + } +} + +static void srw_bend_search(association *assoc, request *req, + Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_searchRetrieveResponse *srw_res) +{ + char *base = "Default"; + bend_search_rr rr; + Z_External *ext; + + yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest"); + + if (!assoc->init) + srw_bend_init(assoc); + + rr.setname = "default"; + rr.replace_set = 1; + rr.num_bases = 1; + rr.basenames = &srw_req->database; + rr.referenceId = 0; + + ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(assoc->decode, + "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + if (srw_req->query) + ext->u.cql = srw_req->query; + else + ext->u.cql = "noterm"; + + rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); + rr.query->which = Z_Query_type_104; + rr.query->u.type_104 = ext; + + rr.stream = assoc->encode; + rr.decode = assoc->decode; + rr.print = assoc->print; + rr.request = req; + rr.association = assoc; + rr.fd = 0; + rr.hits = 0; + rr.errcode = 0; + rr.errstring = 0; + rr.search_info = 0; + yaz_log_zquery(rr.query); + (assoc->init->bend_search)(assoc->backend, &rr); + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); + if (rr.errcode) + { + srw_res->num_diagnostics = 1; + srw_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); + srw_res->diagnostics[0].code = + odr_intdup(assoc->encode, rr.errcode); + srw_res->diagnostics[0].details = rr.errstring; + } + else + { + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); + if (srw_req->maximumRecords && *srw_req->maximumRecords > 0) + { + int number = *srw_req->maximumRecords; + int start = 1; + int i; + if (srw_req->startRecord) + start = *srw_req->startRecord; + if (start <= rr.hits) + { + int j = 0; + if (start + number > rr.hits) + number = rr.hits - start + 1; + srw_res->records = (Z_SRW_record *) + odr_malloc(assoc->encode, + number * sizeof(*srw_res->records)); + for (i = 0; irecords[j].recordData_buf = 0; + srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j); + if (srw_res->records[j].recordData_buf) + j++; + } + srw_res->num_records = j; + if (!j) + srw_res->records = 0; + } + } + } +} + +static void process_http_request(association *assoc, request *req) +{ + Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request; + ODR o = assoc->encode; + Z_GDU *p = 0; + Z_HTTP_Response *hres = 0; + int keepalive = 1; + + if (!strcmp(hreq->method, "GET")) + { +#ifdef DOCDIR + if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 && + !memcmp(hreq->path, "/doc/", 5)) + { + FILE *f; + char fpath[120]; + + strcpy(fpath, DOCDIR); + strcat(fpath, hreq->path+4); + f = fopen(fpath, "rb"); + if (f) { + struct stat sbuf; + if (fstat(fileno(f), &sbuf) || !S_ISREG(sbuf.st_mode)) + { + fclose(f); + f = 0; + } + } + if (f) + { + long sz; + fseek(f, 0L, SEEK_END); + sz = ftell(f); + if (sz >= 0 && sz < 500000) + { + const char *ctype = "application/octet-stream"; + const char *cp; + + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + hres->content_buf = (char *) odr_malloc(o, sz + 1); + hres->content_len = sz; + fseek(f, 0L, SEEK_SET); + fread(hres->content_buf, 1, sz, f); + if ((cp = strrchr(fpath, '.'))) { + cp++; + if (!strcmp(cp, "png")) + ctype = "image/png"; + else if (!strcmp(cp, "gif")) + ctype = "image/gif"; + else if (!strcmp(cp, "xml")) + ctype = "text/xml"; + else if (!strcmp(cp, "html")) + ctype = "text/html"; + } + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + } + fclose(f); + } + } +#endif + if (!strcmp(hreq->path, "/")) + { +#ifdef DOCDIR + struct stat sbuf; +#endif + const char *doclink = ""; + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + hres->content_buf = (char *) odr_malloc(o, 400); +#ifdef DOCDIR + if (stat(DOCDIR "/yaz.html", &sbuf) == 0 && S_ISREG(sbuf.st_mode)) + doclink = "

Documentation

"; +#endif + sprintf (hres->content_buf, + "\n" + "\n" + " \n" + " YAZ " YAZ_VERSION "\n" + " \n" + " \n" + "

YAZ " + YAZ_VERSION "

\n" + "%s" + " \n" + "\n", doclink); + hres->content_len = strlen(hres->content_buf); + z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/html"); + } + if (!p) + { + p = z_get_HTTP_Response(o, 404); + } + } + else if (!strcmp(hreq->method, "POST")) + { + const char *content_type = z_HTTP_header_lookup(hreq->headers, + "Content-Type"); + const char *soap_action = z_HTTP_header_lookup(hreq->headers, + "SOAPAction"); + if (content_type && soap_action && + !yaz_strcmp_del("text/xml", content_type, "; ")) + { + Z_SOAP *soap_package = 0; + int ret = -1; + int http_code = 500; + + static Z_SOAP_Handler soap_handlers[2] = { +#if HAVE_XML2 + {"http://www.loc.gov/zing/srw/v1.0/", 0, + (Z_SOAP_fun) yaz_srw_codec}, +#endif + {0, 0, 0} + }; + ret = z_soap_codec(assoc->decode, &soap_package, + &hreq->content_buf, &hreq->content_len, + soap_handlers); + +#if HAVE_XML2 + if (!ret && soap_package->which == Z_SOAP_generic && + soap_package->u.generic->no == 0) + { + /* SRW package */ + Z_SRW_searchRetrieve *sr = soap_package->u.generic->p; + + if (sr->which == Z_SRW_searchRetrieve_request) + { + Z_SRW_searchRetrieve *res = + yaz_srw_get(assoc->encode, + Z_SRW_searchRetrieve_response); + + if (!sr->u.request->database) + { + const char *p0 = hreq->path, *p1; + if (*p0 == '/') + p0++; + p1 = strchr(p0, '?'); + if (!p1) + p1 = p0 + strlen(p0); + if (p1 != p0) + { + sr->u.request->database = + odr_malloc(assoc->decode, p1 - p0 + 1); + memcpy (sr->u.request->database, p0, p1 - p0); + sr->u.request->database[p1 - p0] = '\0'; + } + else + sr->u.request->database = "Default"; + } + srw_bend_search(assoc, req, sr->u.request, + res->u.response); + + soap_package->u.generic->p = res; + http_code = 200; + } + } +#endif + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + ret = z_soap_codec(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers); + hres->code = http_code; + z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml"); + } + if (!p) /* still no response ? */ + p = z_get_HTTP_Response(o, 500); + } + else + { + p = z_get_HTTP_Response(o, 405); + hres = p->u.HTTP_Response; + + z_HTTP_header_add(o, &hres->headers, "Allow", "GET, POST"); + } + hres = p->u.HTTP_Response; + if (!strcmp(hreq->version, "1.0")) + { + const char *v = z_HTTP_header_lookup(hreq->headers, "Connection"); + if (v && !strcmp(v, "Keep-Alive")) + keepalive = 1; + else + keepalive = 0; + hres->version = "1.0"; + } + else + { + const char *v = z_HTTP_header_lookup(hreq->headers, "Connection"); + if (v && !strcmp(v, "close")) + keepalive = 0; + else + keepalive = 1; + hres->version = "1.1"; + } + if (!keepalive) + { + z_HTTP_header_add(o, &hres->headers, "Connection", "close"); + assoc->state = ASSOC_DEAD; + } + else + { + int t; + const char *alive = z_HTTP_header_lookup(hreq->headers, "Keep-Alive"); + + if (alive && isdigit(*alive)) + t = atoi(alive); + else + t = 30; + if (t < 0 || t > 3600) + t = 3600; + iochan_settimeout(assoc->client_chan,t); + z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + } + process_gdu_response(assoc, req, p); +} + +static void process_gdu_request(association *assoc, request *req) +{ + if (req->gdu_request->which == Z_GDU_Z3950) + { + char *msg = 0; + req->apdu_request = req->gdu_request->u.z3950; + if (process_z_request(assoc, req, &msg) < 0) + do_close_req(assoc, Z_Close_systemProblem, msg, req); + } + else if (req->gdu_request->which == Z_GDU_HTTP_Request) + process_http_request(assoc, req); + else + { + do_close_req(assoc, Z_Close_systemProblem, "bad protocol packet", req); + } +} + /* * Initiate request processing. */ -static int process_request(association *assoc, request *req, char **msg) +static int process_z_request(association *assoc, request *req, char **msg) { int fd = -1; Z_APDU *res; @@ -768,6 +851,8 @@ static int process_request(association *assoc, request *req, char **msg) switch (req->apdu_request->which) { case Z_APDU_initRequest: + iochan_settimeout(assoc->client_chan, + statserv_getcontrol()->idle_timeout * 60); res = process_initRequest(assoc, req); break; case Z_APDU_searchRequest: res = process_searchRequest(assoc, req, &fd); break; @@ -830,7 +915,7 @@ static int process_request(association *assoc, request *req, char **msg) if (res) { yaz_log(LOG_DEBUG, " result immediately available"); - retval = process_response(assoc, req, res); + retval = process_z_response(assoc, req, res); } else if (fd < 0) { @@ -880,7 +965,7 @@ void backend_response(IOCHAN i, int event) yaz_log(LOG_WARN, "Serious programmer's lapse or bug"); abort(); } - if ((res && process_response(assoc, req, res) < 0) || fd < 0) + if ((res && process_z_response(assoc, req, res) < 0) || fd < 0) { yaz_log(LOG_LOG, "Fatal error when talking to backend"); do_close(assoc, Z_Close_systemProblem, 0); @@ -897,7 +982,46 @@ void backend_response(IOCHAN i, int event) /* * Encode response, and transfer the request structure to the outgoing queue. */ -static int process_response(association *assoc, request *req, Z_APDU *res) +static int process_gdu_response(association *assoc, request *req, Z_GDU *res) +{ + odr_setbuf(assoc->encode, req->response, req->size_response, 1); + + if (assoc->print && !z_GDU(assoc->print, &res, 0, 0)) + { + yaz_log(LOG_WARN, "ODR print error: %s", + odr_errmsg(odr_geterror(assoc->print))); + odr_reset(assoc->print); + } + if (!z_GDU(assoc->encode, &res, 0, 0)) + { + yaz_log(LOG_WARN, "ODR error when encoding response: %s", + odr_errmsg(odr_geterror(assoc->decode))); + return -1; + } + req->response = odr_getbuf(assoc->encode, &req->len_response, + &req->size_response); + odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */ + odr_reset(assoc->encode); + req->state = REQUEST_IDLE; + request_enq(&assoc->outgoing, req); + /* turn the work over to the ir_session handler */ + iochan_setflag(assoc->client_chan, EVENT_OUTPUT); + assoc->cs_put_mask = EVENT_OUTPUT; + /* Is there more work to be done? give that to the input handler too */ +#if 1 + if (request_head(&assoc->incoming)) + { + yaz_log (LOG_DEBUG, "more work to be done"); + iochan_setevent(assoc->client_chan, EVENT_WORK); + } +#endif + return 0; +} + +/* + * Encode response, and transfer the request structure to the outgoing queue. + */ +static int process_z_response(association *assoc, request *req, Z_APDU *res) { odr_setbuf(assoc->encode, req->response, req->size_response, 1); @@ -947,7 +1071,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse); Z_InitResponse *resp = apdu->u.initResponse; bend_initresult *binitres; - char options[100]; + + char options[140]; xfree (assoc->init); assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); @@ -965,6 +1090,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->auth = req->idAuthentication; assoc->init->referenceId = req->referenceId; assoc->init->implementation_version = 0; + assoc->init->implementation_id = 0; assoc->init->implementation_name = 0; assoc->init->bend_sort = NULL; assoc->init->bend_search = NULL; @@ -974,6 +1100,17 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->bend_scan = NULL; assoc->init->bend_segment = NULL; assoc->init->bend_fetch = NULL; + assoc->init->charneg_request = NULL; + assoc->init->charneg_response = NULL; + assoc->init->decode = assoc->decode; + + if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)) + { + Z_CharSetandLanguageNegotiation *negotiation = + yaz_get_charneg_record (req->otherInfo); + if (negotiation->which == Z_CharSetandLanguageNegotiation_proposal) + assoc->init->charneg_request = negotiation; + } assoc->init->peer_name = odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); @@ -1037,13 +1174,33 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (ODR_MASK_GET(req->options, Z_Options_concurrentOperations)) { ODR_MASK_SET(resp->options, Z_Options_concurrentOperations); - strcat(options, " concurop"); + strcat(options, " concurrop"); } if (ODR_MASK_GET(req->options, Z_Options_sort) && assoc->init->bend_sort) { ODR_MASK_SET(resp->options, Z_Options_sort); strcat(options, " sort"); } + + if (ODR_MASK_GET(req->options, Z_Options_negotiationModel) + && assoc->init->charneg_response) + { + Z_OtherInformation **p; + Z_OtherInformationUnit *p0; + + yaz_oi_APDU(apdu, &p); + + if ((p0=yaz_oi_update(p, assoc->encode, NULL, 0, 0))) { + ODR_MASK_SET(resp->options, Z_Options_negotiationModel); + + p0->which = Z_OtherInfo_externallyDefinedInfo; + p0->information.externallyDefinedInfo = + assoc->init->charneg_response; + } + ODR_MASK_SET(resp->options, Z_Options_negotiationModel); + strcat(options, " negotiation"); + } + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) { ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1); @@ -1059,6 +1216,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); assoc->version = 3; } + yaz_log(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options); assoc->maximumRecordSize = *req->maximumRecordSize; if (assoc->maximumRecordSize > control_block->maxrecordsize) @@ -1075,8 +1233,18 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize; - resp->implementationName = "GFS"; + resp->implementationName = "GFS/YAZ"; + if (assoc->init->implementation_id) + { + char *nv = (char *) + odr_malloc (assoc->encode, + strlen(assoc->init->implementation_id) + 10 + + strlen(resp->implementationId)); + sprintf (nv, "%s / %s", + resp->implementationId, assoc->init->implementation_id); + resp->implementationId = nv; + } if (assoc->init->implementation_name) { char *nv = (char *) @@ -1116,13 +1284,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo, ODR odr) { -#if ASN_COMPILED dr->which = Z_DefaultDiagFormat_v2Addinfo; dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); -#else - dr->which = Z_DiagForm_v2AddInfo; - dr->addinfo = odr_strdup (odr, addinfo ? addinfo : ""); -#endif } /* @@ -1138,16 +1301,10 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) odr_malloc (assoc->encode, sizeof(*dr)); - yaz_log(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : - "NULL"); + yaz_log(LOG_LOG, "[%d] %s %s%s", error, diagbib1_str(error), + addinfo ? " -- " : "", addinfo ? addinfo : ""); 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 = yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); dr->condition = err; @@ -1206,13 +1363,8 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); rec->condition = err; -#ifdef ASN_COMPILED rec->which = Z_DefaultDiagFormat_v2Addinfo; rec->u.v2Addinfo = odr_strdup (assoc->encode, addinfo ? addinfo : ""); -#else - rec->which = Z_DiagForm_v2AddInfo; - rec->addinfo = odr_strdup (assoc->encode, addinfo ? addinfo : ""); -#endif return recs; } @@ -1238,7 +1390,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, *num = 0; *next = 0; - yaz_log(LOG_LOG, "Request to pack %d+%d", start, toget); + yaz_log(LOG_LOG, "Request to pack %d+%d+%s", start, toget, setname); yaz_log(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize, a->maximumRecordSize); for (recno = start; reclist->num_records < toget; recno++) @@ -1277,7 +1429,15 @@ static Z_Records *pack_records(association *a, char *setname, int start, { if (!freq.surrogate_flag) { + char s[20]; *pres = Z_PRES_FAILURE; + /* for 'present request out of range', + set addinfo to record position if not set */ + if (freq.errcode == 13 && freq.errstring == 0) + { + sprintf (s, "%d", recno); + freq.errstring = s; + } return diagrec(a, freq.errcode, freq.errstring); } reclist->records[reclist->num_records] = @@ -1319,7 +1479,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, } else /* too big entirely */ { - yaz_log(LOG_DEBUG, "Record > maxrcdsz"); + yaz_log(LOG_LOG, "Record > maxrcdsz this=%d max=%d", this_length, a->maximumRecordSize); reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, 17, 0); reclist->num_records++; @@ -1376,11 +1536,8 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, 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); - } + yaz_log_zquery(req->query); + if (assoc->init->bend_search) { bsrr->setname = req->resultSetName; @@ -1394,32 +1551,11 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrr->errcode = 0; bsrr->hits = 0; bsrr->errstring = NULL; + bsrr->search_info = NULL; (assoc->init->bend_search)(assoc->backend, bsrr); if (!bsrr->request) return 0; } -#if 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; - 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); } @@ -1471,6 +1607,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, int *presst = odr_intdup(assoc->encode, 0); Z_RecordComposition comp, *compp = 0; + yaz_log (LOG_LOG, "resultCount: %d", bsrt->hits); + resp->records = 0; resp->resultCount = &bsrt->hits; @@ -1524,6 +1662,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, resp->presentStatus = 0; } } + resp->additionalSearchInfo = bsrt->search_info; return apdu; } @@ -1628,18 +1767,21 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) Z_ListEntries *ents = (Z_ListEntries *) odr_malloc (assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; - oident *attent; oident *attset; + bend_scan_rr *bsrr = (bend_scan_rr *) + odr_malloc (assoc->encode, sizeof(*bsrr)); yaz_log(LOG_LOG, "Got ScanRequest"); apdu->which = Z_APDU_scanResponse; apdu->u.scanResponse = res; res->referenceId = req->referenceId; - res->stepSize = odr_intdup(assoc->encode, 0); + /* if step is absent, set it to 0 */ + res->stepSize = odr_intdup(assoc->encode, 0); if (req->stepSize) *res->stepSize = *req->stepSize; + res->scanStatus = scanStatus; res->numberOfEntriesReturned = numberOfEntriesReturned; res->positionOfTerm = 0; @@ -1651,98 +1793,88 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) res->attributeSet = 0; res->otherInfo = 0; - if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || - attent->oclass != CLASS_ATTSET - || attent->value != VAL_BIB1)) - diagrecs_p = diagrecs(assoc, 121, 0); - else if (req->stepSize && *req->stepSize > 0) - diagrecs_p = diagrecs(assoc, 205, 0); + if (req->databaseNames) + { + int i; + for (i = 0; i < req->num_databaseNames; i++) + yaz_log (LOG_LOG, "Database '%s'", req->databaseNames[i]); + } + bsrr->num_bases = req->num_databaseNames; + bsrr->basenames = req->databaseNames; + bsrr->num_entries = *req->numberOfTermsRequested; + bsrr->term = req->termListAndStartPoint; + bsrr->referenceId = req->referenceId; + bsrr->stream = assoc->encode; + bsrr->print = assoc->print; + bsrr->step_size = res->stepSize; + if (req->attributeSet && + (attset = oid_getentbyoid(req->attributeSet)) && + (attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL)) + bsrr->attributeset = attset->value; + else + bsrr->attributeset = VAL_NONE; + log_scan_term (req->termListAndStartPoint, bsrr->attributeset); + bsrr->term_position = req->preferredPositionInResponse ? + *req->preferredPositionInResponse : 1; + ((int (*)(void *, bend_scan_rr *)) + (*assoc->init->bend_scan))(assoc->backend, bsrr); + if (bsrr->errcode) + diagrecs_p = diagrecs(assoc, bsrr->errcode, bsrr->errstring); else { - 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; - bsrr->print = assoc->print; - bsrr->step_size = res->stepSize; - if (!(attset = oid_getentbyoid(req->attributeSet)) || - attset->oclass != CLASS_RECSYN) - bsrr->attributeset = VAL_NONE; - else - bsrr->attributeset = attset->value; - log_scan_term (req->termListAndStartPoint, bsrr->attributeset); - bsrr->term_position = req->preferredPositionInResponse ? - *req->preferredPositionInResponse : 1; - ((int (*)(void *, bend_scan_rr *)) - (*assoc->init->bend_scan))(assoc->backend, bsrr); - if (bsrr->errcode) - diagrecs_p = diagrecs(assoc, bsrr->errcode, bsrr->errstring); - else - { - int i; - Z_Entry **tab = (Z_Entry **) - odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries); - - if (bsrr->status == BEND_SCAN_PARTIAL) - *scanStatus = Z_Scan_partial_5; - else - *scanStatus = Z_Scan_success; - ents->entries = tab; - ents->num_entries = bsrr->num_entries; - res->numberOfEntriesReturned = &ents->num_entries; - res->positionOfTerm = &bsrr->term_position; - for (i = 0; i < bsrr->num_entries; i++) - { - Z_Entry *e; - Z_TermInfo *t; - Odr_oct *o; - - tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); - if (bsrr->entries[i].occurrences >= 0) - { - e->which = Z_Entry_termInfo; - e->u.termInfo = t = (Z_TermInfo *) - odr_malloc(assoc->encode, sizeof(*t)); - t->suggestedAttributes = 0; - t->displayTerm = 0; - t->alternativeTerm = 0; - t->byAttributes = 0; - t->otherTermInfo = 0; - t->globalOccurrences = &bsrr->entries[i].occurrences; - t->term = (Z_Term *) - odr_malloc(assoc->encode, sizeof(*t->term)); - t->term->which = Z_Term_general; - t->term->u.general = o = - (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct)); - o->buf = (unsigned char *) - odr_malloc(assoc->encode, o->len = o->size = - strlen(bsrr->entries[i].term)); - memcpy(o->buf, bsrr->entries[i].term, o->len); - yaz_log(LOG_DEBUG, " term #%d: '%s' (%d)", i, + int i; + Z_Entry **tab = (Z_Entry **) + odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries); + + if (bsrr->status == BEND_SCAN_PARTIAL) + *scanStatus = Z_Scan_partial_5; + else + *scanStatus = Z_Scan_success; + ents->entries = tab; + ents->num_entries = bsrr->num_entries; + res->numberOfEntriesReturned = &ents->num_entries; + res->positionOfTerm = &bsrr->term_position; + for (i = 0; i < bsrr->num_entries; i++) + { + Z_Entry *e; + Z_TermInfo *t; + Odr_oct *o; + + tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); + if (bsrr->entries[i].occurrences >= 0) + { + e->which = Z_Entry_termInfo; + e->u.termInfo = t = (Z_TermInfo *) + odr_malloc(assoc->encode, sizeof(*t)); + t->suggestedAttributes = 0; + t->displayTerm = 0; + t->alternativeTerm = 0; + t->byAttributes = 0; + t->otherTermInfo = 0; + t->globalOccurrences = &bsrr->entries[i].occurrences; + t->term = (Z_Term *) + odr_malloc(assoc->encode, sizeof(*t->term)); + t->term->which = Z_Term_general; + t->term->u.general = o = + (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct)); + o->buf = (unsigned char *) + odr_malloc(assoc->encode, o->len = o->size = + strlen(bsrr->entries[i].term)); + memcpy(o->buf, bsrr->entries[i].term, o->len); + yaz_log(LOG_DEBUG, " term #%d: '%s' (%d)", i, bsrr->entries[i].term, bsrr->entries[i].occurrences); - } - else - { - Z_DiagRecs *drecs = diagrecs (assoc, - bsrr->entries[i].errcode, - bsrr->entries[i].errstring); - assert (drecs->num_diagRecs == 1); - e->which = Z_Entry_surrogateDiagnostic; - assert (drecs->diagRecs[0]); - e->u.surrogateDiagnostic = drecs->diagRecs[0]; - } - } - } + } + else + { + Z_DiagRecs *drecs = diagrecs (assoc, + bsrr->entries[i].errcode, + bsrr->entries[i].errstring); + assert (drecs->num_diagRecs == 1); + e->which = Z_Entry_surrogateDiagnostic; + assert (drecs->diagRecs[0]); + e->u.surrogateDiagnostic = drecs->diagRecs[0]; + } + } } if (diagrecs_p) { @@ -1765,13 +1897,8 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, 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; @@ -1790,18 +1917,12 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, 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; @@ -1923,7 +2044,7 @@ void save_referenceId (request *reqb, Z_ReferenceId *refid) void bend_request_send (bend_association a, bend_request req, Z_APDU *res) { - process_response (a, req, res); + process_z_response (a, req, res); } bend_request bend_request_mk (bend_association a) @@ -1956,9 +2077,9 @@ int bend_backend_respond (bend_association a, bend_request req) { char *msg; int r; - r = process_request (a, req, &msg); + r = process_z_request (a, req, &msg); if (r < 0) - logf (LOG_WARN, "%s", msg); + yaz_log (LOG_WARN, "%s", msg); return r; } @@ -1974,15 +2095,15 @@ void *bend_request_getdata(bend_request r) static Z_APDU *process_segmentRequest (association *assoc, request *reqb) { - bend_segment_rr request; + bend_segment_rr req; - request.segment = reqb->apdu_request->u.segmentRequest; - request.stream = assoc->encode; - request.decode = assoc->decode; - request.print = assoc->print; - request.association = assoc; + req.segment = reqb->apdu_request->u.segmentRequest; + req.stream = assoc->encode; + req.decode = assoc->decode; + req.print = assoc->print; + req.association = assoc; - (*assoc->init->bend_segment)(assoc->backend, &request); + (*assoc->init->bend_segment)(assoc->backend, &req); return 0; } @@ -1991,7 +2112,8 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) { bend_esrequest_rr esrequest; - Z_ExtendedServicesRequest *req = reqb->apdu_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; @@ -2048,3 +2170,4 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) yaz_log(LOG_DEBUG,"Send the result apdu"); return apdu; } +