X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=277050ab5825a62193748b153aecf4643fc31fe3;hb=33b5e2e3822214b25aa544688a2788086840b7a6;hp=33c7b067b85cf728df0f91239723edffc0c99e43;hpb=617d78c63e7a502367abc3504f192770aa537482;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 33c7b06..277050a 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,10 +1,62 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.92 1999-06-17 10:54:45 adam + * 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. * @@ -319,7 +371,6 @@ * */ -#include #include #include #ifdef WIN32 @@ -329,19 +380,20 @@ #endif #include -#include -#include +#include +#include +#include #include "eventl.h" #include "session.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -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); @@ -357,6 +409,7 @@ static void process_close(association *assoc, request *reqb); void save_referenceId (request *reqb, Z_ReferenceId *refid); static Z_APDU *process_deleteRequest(association *assoc, request *reqb, int *fd); +static Z_APDU *process_segmentRequest (association *assoc, request *reqb); static FILE *apduf = 0; /* for use in static mode */ static statserv_options_block *control_block = 0; @@ -379,6 +432,7 @@ association *create_association(IOCHAN channel, COMSTACK link) control_block = statserv_getcontrol(); if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; + anew->init = 0; anew->client_chan = channel; anew->client_link = link; if (!(anew->decode = odr_createmem(ODR_DECODE)) || @@ -401,7 +455,7 @@ association *create_association(IOCHAN channel, COMSTACK link) { if (!(apduf = fopen(filename, "w"))) { - logf(LOG_WARN|LOG_ERRNO, "%s", filename); + yaz_log(LOG_WARN|LOG_ERRNO, "%s", filename); return 0; } setvbuf(apduf, 0, _IONBF, 0); @@ -413,7 +467,7 @@ association *create_association(IOCHAN channel, COMSTACK link) sprintf(filename + strlen(filename), ".%d", getpid()); if (!(f = fopen(filename, "w"))) { - logf(LOG_WARN|LOG_ERRNO, "%s", filename); + yaz_log(LOG_WARN|LOG_ERRNO, "%s", filename); return 0; } setvbuf(f, 0, _IONBF, 0); @@ -438,6 +492,9 @@ association *create_association(IOCHAN channel, COMSTACK link) */ 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) @@ -445,12 +502,14 @@ void destroy_association(association *h) 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); request_delq(&h->outgoing); xfree(h); + if (control_block && control_block->one_shot) + exit (0); } static void do_close_req(association *a, int reason, char *message, @@ -464,7 +523,7 @@ static void do_close_req(association *a, int reason, char *message, while (request_deq(&a->outgoing)); if (a->version >= 3) { - logf(LOG_LOG, "Sending Close PDU, reason=%d, message=%s", + yaz_log(LOG_LOG, "Sending Close PDU, reason=%d, message=%s", reason, message ? message : "none"); apdu.which = Z_APDU_close; apdu.u.close = cls; @@ -475,7 +534,7 @@ static void do_close_req(association *a, int reason, char *message, } else { - logf(LOG_DEBUG, "v2 client. No Close PDU"); + yaz_log(LOG_DEBUG, "v2 client. No Close PDU"); iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */ } a->state = ASSOC_DEAD; @@ -507,14 +566,14 @@ void ir_session(IOCHAN h, int event) { if (assoc->state != ASSOC_UP) { - logf(LOG_LOG, "Final timeout - closing connection."); + yaz_log(LOG_LOG, "Final timeout - closing connection."); cs_close(conn); destroy_association(assoc); iochan_destroy(h); } else { - logf(LOG_LOG, "Session idle too long. Sending close."); + yaz_log(LOG_LOG, "Session idle too long. Sending close."); do_close(assoc, Z_Close_lackOfActivity, 0); } return; @@ -523,12 +582,12 @@ void ir_session(IOCHAN h, int event) { if (event & EVENT_INPUT) { - logf(LOG_DEBUG, "ir_session (input)"); + yaz_log(LOG_DEBUG, "ir_session (input)"); assert(assoc && conn); /* We aren't speaking to this fellow */ if (assoc->state == ASSOC_DEAD) { - logf(LOG_LOG, "Closed connection after reject"); + yaz_log(LOG_LOG, "Closed connection after reject"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -537,7 +596,7 @@ void ir_session(IOCHAN h, int event) if ((res = cs_get(conn, &assoc->input_buffer, &assoc->input_buffer_len)) <= 0) { - logf(LOG_LOG, "Connection closed by client"); + yaz_log(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -549,24 +608,24 @@ void ir_session(IOCHAN h, int event) iochan_setevent(h, EVENT_INPUT); /* we got a complete PDU. Let's decode it */ - logf(LOG_DEBUG, "Got PDU, %d bytes", res); + yaz_log(LOG_DEBUG, "Got PDU, %d bytes", res); req = request_get(&assoc->incoming); /* get a new request structure */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_APDU(assoc->decode, &req->request, 0, 0)) { - logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", + yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", odr_errmsg(odr_geterror(assoc->decode)), odr_offset(assoc->decode)); - logf(LOG_LOG, "PDU dump:"); - odr_dumpBER(log_file(), assoc->input_buffer, res); + yaz_log(LOG_LOG, "PDU dump:"); + 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)) { - logf(LOG_WARN, "ODR print error: %s", + yaz_log(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } @@ -577,28 +636,28 @@ 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) < 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) { request *req = request_head(&assoc->outgoing); - logf(LOG_DEBUG, "ir_session (output)"); + yaz_log(LOG_DEBUG, "ir_session (output)"); req->state = REQUEST_PENDING; switch (res = cs_put(conn, req->response, req->len_response)) { case -1: - logf(LOG_LOG, "Connection closed by client"); + yaz_log(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); break; case 0: /* all sent - release the request structure */ - logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response); + yaz_log(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response); nmem_destroy(req->request_mem); request_deq(&assoc->outgoing); request_release(req); @@ -610,7 +669,7 @@ void ir_session(IOCHAN h, int event) } if (event & EVENT_EXCEPT) { - logf(LOG_DEBUG, "ir_session (exception)"); + yaz_log(LOG_DEBUG, "ir_session (exception)"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -620,64 +679,89 @@ void ir_session(IOCHAN h, int event) /* * 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); + if (req->request->which != Z_APDU_initRequest && !assoc->init) + { + *msg = "Missing InitRequest"; + return -1; + } switch (req->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: - res = process_scanRequest(assoc, req, &fd); break; - case Z_APDU_extendedServicesRequest: - if (assoc->bend_esrequest) - res = process_ESRequest(assoc, req, &fd); - else - { - logf(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 - { - logf(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 - { - logf (LOG_WARN, "Cannot handle Delete APDU"); - return -1; - } - break; - default: - logf(LOG_WARN, "Bad APDU received"); + case Z_APDU_initRequest: + res = process_initRequest(assoc, req); break; + case Z_APDU_searchRequest: + res = process_searchRequest(assoc, req, &fd); break; + case Z_APDU_presentRequest: + res = process_presentRequest(assoc, req, &fd); break; + case Z_APDU_scanRequest: + if (assoc->init->bend_scan) + res = process_scanRequest(assoc, req, &fd); + else + { + *msg = "Cannot handle Scan APDU"; + return -1; + } + break; + case Z_APDU_extendedServicesRequest: + if (assoc->init->bend_esrequest) + res = process_ESRequest(assoc, req, &fd); + else + { + *msg = "Cannot handle Extended Services APDU"; + return -1; + } + break; + case Z_APDU_sortRequest: + if (assoc->init->bend_sort) + res = process_sortRequest(assoc, req, &fd); + else + { + *msg = "Cannot handle Sort APDU"; + return -1; + } + break; + case Z_APDU_close: + process_close(assoc, req); + return 0; + case Z_APDU_deleteResultSetRequest: + if (assoc->init->bend_delete) + res = process_deleteRequest(assoc, req, &fd); + else + { + *msg = "Cannot handle Delete APDU"; return -1; + } + break; + case Z_APDU_segmentRequest: + if (assoc->init->bend_segment) + { + res = process_segmentRequest (assoc, req); + } + else + { + *msg = "Cannot handle Segment APDU"; + return -1; + } + break; + default: + *msg = "Bad APDU received"; + return -1; } if (res) { - logf(LOG_DEBUG, " result immediately available"); + yaz_log(LOG_DEBUG, " result immediately available"); retval = process_response(assoc, req, res); } else if (fd < 0) { - logf(LOG_DEBUG, " result unavailble"); + yaz_log(LOG_DEBUG, " result unavailble"); retval = 0; } else /* no result yet - one will be provided later */ @@ -686,7 +770,7 @@ static int process_request(association *assoc, request *req) /* Set up an I/O handler for the fd supplied by the backend */ - logf(LOG_DEBUG, " establishing handler for result"); + yaz_log(LOG_DEBUG, " establishing handler for result"); req->state = REQUEST_PENDING; if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT))) abort(); @@ -706,7 +790,7 @@ void backend_response(IOCHAN i, int event) Z_APDU *res; int fd; - logf(LOG_DEBUG, "backend_response"); + yaz_log(LOG_DEBUG, "backend_response"); assert(assoc && req && req->state != REQUEST_IDLE); /* determine what it is we're waiting for */ switch (req->request->which) @@ -720,19 +804,19 @@ void backend_response(IOCHAN i, int event) res = response_scanRequest(assoc, req, 0, &fd); break; #endif default: - logf(LOG_WARN, "Serious programmer's lapse or bug"); + yaz_log(LOG_WARN, "Serious programmer's lapse or bug"); abort(); } if ((res && process_response(assoc, req, res) < 0) || fd < 0) { - logf(LOG_LOG, "Fatal error when talking to backend"); + yaz_log(LOG_LOG, "Fatal error when talking to backend"); do_close(assoc, Z_Close_systemProblem, 0); iochan_destroy(i); return; } else if (!res) /* no result yet - try again later */ { - logf(LOG_DEBUG, " no result yet"); + yaz_log(LOG_DEBUG, " no result yet"); iochan_setfd(i, fd); /* in case fd has changed */ } } @@ -745,7 +829,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) odr_setbuf(assoc->encode, req->response, req->size_response, 1); if (!z_APDU(assoc->encode, &res, 0, 0)) { - logf(LOG_WARN, "ODR error when encoding response: %s", + yaz_log(LOG_WARN, "ODR error when encoding response: %s", odr_errmsg(odr_geterror(assoc->decode))); odr_reset(assoc->encode); return -1; @@ -755,7 +839,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */ if (assoc->print && !z_APDU(assoc->print, &res, 0, 0)) { - logf(LOG_WARN, "ODR print error: %s", + yaz_log(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } @@ -768,7 +852,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) #if 1 if (request_head(&assoc->incoming)) { - logf (LOG_DEBUG, "more work to be done"); + yaz_log (LOG_DEBUG, "more work to be done"); iochan_setevent(assoc->client_chan, EVENT_WORK); } #endif @@ -784,49 +868,62 @@ static int process_response(association *assoc, request *req, Z_APDU *res) */ static Z_APDU *process_initRequest(association *assoc, request *reqb) { + statserv_options_block *cb = statserv_getcontrol(); Z_InitRequest *req = reqb->request->u.initRequest; Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse); Z_InitResponse *resp = apdu->u.initResponse; - bend_initrequest binitreq; bend_initresult *binitres; char options[100]; - logf(LOG_LOG, "Got initRequest"); + xfree (assoc->init); + assoc->init = xmalloc (sizeof(*assoc->init)); + + yaz_log(LOG_LOG, "Got initRequest"); if (req->implementationId) - logf(LOG_LOG, "Id: %s", req->implementationId); + yaz_log(LOG_LOG, "Id: %s", req->implementationId); if (req->implementationName) - logf(LOG_LOG, "Name: %s", req->implementationName); + yaz_log(LOG_LOG, "Name: %s", req->implementationName); if (req->implementationVersion) - logf(LOG_LOG, "Version: %s", req->implementationVersion); - - binitreq.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))) + yaz_log(LOG_LOG, "Version: %s", req->implementationVersion); + + assoc->init->stream = assoc->encode; + assoc->init->print = assoc->print; + assoc->init->auth = req->idAuthentication; + assoc->init->referenceId = req->referenceId; + assoc->init->implementation_version = 0; + assoc->init->implementation_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))) { - logf(LOG_WARN, "Bad response from backend."); + yaz_log(LOG_WARN, "Bad response from backend."); return 0; } assoc->backend = binitres->handle; - if ((assoc->bend_sort = (int (*)())binitreq.bend_sort)) - logf (LOG_DEBUG, "Sort handler installed"); - if ((assoc->bend_search = (int (*)())binitreq.bend_search)) - logf (LOG_DEBUG, "Search handler installed"); - if ((assoc->bend_present = (int (*)())binitreq.bend_present)) - logf (LOG_DEBUG, "Present handler installed"); - if ((assoc->bend_esrequest = (int (*)())binitreq.bend_esrequest)) - logf (LOG_DEBUG, "ESRequest handler installed"); - if ((assoc->bend_delete = (int (*)())binitreq.bend_delete)) - logf (LOG_DEBUG, "Delete handler installed"); + if ((assoc->init->bend_sort)) + yaz_log (LOG_DEBUG, "Sort handler installed"); + if ((assoc->init->bend_search)) + yaz_log (LOG_DEBUG, "Search handler installed"); + if ((assoc->init->bend_present)) + yaz_log (LOG_DEBUG, "Present handler installed"); + if ((assoc->init->bend_esrequest)) + yaz_log (LOG_DEBUG, "ESRequest handler installed"); + if ((assoc->init->bend_delete)) + yaz_log (LOG_DEBUG, "Delete handler installed"); + if ((assoc->init->bend_scan)) + yaz_log (LOG_DEBUG, "Scan handler installed"); + if ((assoc->init->bend_segment)) + yaz_log (LOG_DEBUG, "Segment handler installed"); resp->referenceId = req->referenceId; *options = '\0'; @@ -841,13 +938,14 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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"); @@ -857,7 +955,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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"); @@ -867,7 +965,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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"); @@ -887,7 +985,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); assoc->version = 3; } - logf(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options); + yaz_log(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options); assoc->maximumRecordSize = *req->maximumRecordSize; if (assoc->maximumRecordSize > control_block->maxrecordsize) assoc->maximumRecordSize = control_block->maxrecordsize; @@ -897,32 +995,33 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize; - resp->implementationName = "Index Data/YAZ Generic Frontend Server"; + resp->implementationName = "GFS"; - 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; } if (binitres->errcode) { - logf(LOG_LOG, "Connection rejected by backend."); + yaz_log(LOG_LOG, "Connection rejected by backend."); *resp->result = 0; assoc->state = ASSOC_DEAD; } @@ -966,7 +1065,7 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; - logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : + yaz_log(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : "NULL"); *err = error; rec->which = Z_Records_NSD; @@ -1003,7 +1102,7 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; - logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); + yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); *err = error; rec->databaseName = dbname; rec->which = Z_NamePlusRecord_surrogateDiagnostic; @@ -1031,7 +1130,7 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*rec)); - logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : ""); + yaz_log(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : ""); bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; @@ -1058,9 +1157,10 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) } 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 = @@ -1078,13 +1178,12 @@ static Z_Records *pack_records(association *a, char *setname, int start, *num = 0; *next = 0; - logf(LOG_LOG, "Request to pack %d+%d", start, toget); - logf(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize, + yaz_log(LOG_LOG, "Request to pack %d+%d", start, toget); + yaz_log(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize, a->maximumRecordSize); for (recno = start; reclist->num_records < toget; recno++) { - bend_fetchrequest freq; - bend_fetchresult *fres; + bend_fetch_rr freq; Z_NamePlusRecord *thisrec; int this_length = 0; /* @@ -1093,71 +1192,78 @@ static Z_Records *pack_records(association *a, char *setname, int start, * 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; - logf(LOG_DEBUG, " fetched record, len=%d, total=%d", + yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d", this_length, total_length); if (this_length + total_length > a->preferredMessageSize) { /* record is small enough, really */ if (this_length <= a->preferredMessageSize) { - logf(LOG_DEBUG, " Dropped last normal-sized record"); + yaz_log(LOG_DEBUG, " Dropped last normal-sized record"); *pres = Z_PRES_PARTIAL_2; break; } /* record can only be fetched by itself */ if (this_length < a->maximumRecordSize) { - logf(LOG_DEBUG, " Record > prefmsgsz"); + yaz_log(LOG_DEBUG, " Record > prefmsgsz"); if (toget > 1) { - logf(LOG_DEBUG, " Dropped it"); + yaz_log(LOG_DEBUG, " Dropped it"); reclist->records[reclist->num_records] = - surrogatediagrec(a, fres->basename, 16, 0); + 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; } } else /* too big entirely */ { - logf(LOG_DEBUG, "Record > maxrcdsz"); + yaz_log(LOG_DEBUG, "Record > maxrcdsz"); reclist->records[reclist->num_records] = - surrogatediagrec(a, fres->basename, 17, 0); + 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; } @@ -1167,17 +1273,23 @@ static Z_Records *pack_records(association *a, char *setname, int start, 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; @@ -1190,26 +1302,26 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bend_search_rr *bsrr = (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); - logf(LOG_LOG, "Got SearchRequest."); + yaz_log(LOG_LOG, "Got SearchRequest."); bsrr->fd = fd; bsrr->request = reqb; bsrr->association = assoc; bsrr->referenceId = req->referenceId; save_referenceId (reqb, bsrr->referenceId); - logf (LOG_LOG, "ResultSet '%s'", req->resultSetName); + yaz_log (LOG_LOG, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) { int i; for (i = 0; i < req->num_databaseNames; i++) - logf (LOG_LOG, "Database '%s'", req->databaseNames[i]); + yaz_log (LOG_LOG, "Database '%s'", req->databaseNames[i]); } switch (req->query->which) { case Z_Query_type_1: case Z_Query_type_101: log_rpn_query (req->query->u.type_1); } - if (assoc->bend_search) + if (assoc->init->bend_search) { bsrr->setname = req->resultSetName; bsrr->replace_set = *req->replaceIndicator; @@ -1218,14 +1330,15 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, 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; @@ -1239,12 +1352,14 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, 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); } @@ -1282,7 +1397,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, *fd = -1; if (!bsrt && !bend_searchresponse(assoc->backend, bsrt)) { - logf(LOG_FATAL, "Bad result from backend"); + yaz_log(LOG_FATAL, "Bad result from backend"); return 0; } else if (bsrt->errcode) @@ -1336,7 +1451,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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; @@ -1375,7 +1491,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, * 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; oident *prefformat; @@ -1386,14 +1502,14 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *next; int *num; - logf(LOG_LOG, "Got PresentRequest."); + yaz_log(LOG_LOG, "Got PresentRequest."); if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || prefformat->oclass != CLASS_RECSYN) form = VAL_NONE; else form = prefformat->value; - if (assoc->bend_present) + if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr *) nmem_malloc (reqb->request_mem, sizeof(*bprr)); @@ -1404,12 +1520,12 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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; @@ -1431,7 +1547,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, resp->records = pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, num, req->recordComposition, next, presst, form, - req->referenceId); + req->referenceId, req->preferredRecordSyntax); if (!resp->records) return 0; resp->numberOfRecordsReturned = num; @@ -1441,6 +1557,34 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, return apdu; } +#if 0 +static int bend_default_scan (void *handle, bend_scan_rr *rr) +{ + bend_scanrequest srq; + bend_scanresult *srs; + + srq.num_bases = rr->num_bases; + srq.basenames = rr->basenames; + srq.attributeset = rr->attributeset; + srq.referenceId = rr->referenceId; + srq.term = rr->term; + srq.term_position = rr->term_position; + srq.num_entries = rr->num_entries; + srq.stream = rr->stream; + srq.print = rr->print; + + srs = bend_scan(handle, &srq, 0); + + rr->term_position = srs->term_position; + rr->num_entries = srs->num_entries; + rr->entries = srs->entries; + rr->status = srs->status; + rr->errcode = srs->errcode; + rr->errstring = srs->errstring; + return 0; +} +#endif + /* * Scan was implemented rather in a hurry, and with support for only the basic * elements of the service in the backend API. Suggestions are welcome. @@ -1459,11 +1603,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) odr_malloc (assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; oident *attent; - bend_scanrequest srq; - bend_scanresult *srs; oident *attset; - logf(LOG_LOG, "Got ScanRequest"); + yaz_log(LOG_LOG, "Got ScanRequest"); *scanStatus = Z_Scan_failure; *numberOfEntriesReturned = 0; @@ -1490,52 +1632,55 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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++) - logf (LOG_LOG, "Database '%s'", req->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; if (!(attset = oid_getentbyoid(req->attributeSet)) || attset->oclass != CLASS_RECSYN) - srq.attributeset = VAL_NONE; + bsrr->attributeset = VAL_NONE; else - srq.attributeset = attset->value; + bsrr->attributeset = attset->value; log_scan_term (req->termListAndStartPoint, attset->value); - srq.term_position = req->preferredPositionInResponse ? + 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 *) @@ -1545,7 +1690,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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; @@ -1553,16 +1698,16 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) (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); - logf(LOG_DEBUG, " term #%d: '%s' (%d)", i, - srs->entries[i].term, srs->entries[i].occurrences); + 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, - 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]); @@ -1590,7 +1735,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); - logf(LOG_LOG, "Got SortRequest."); + yaz_log(LOG_LOG, "Got SortRequest."); #ifdef ASN_COMPILED bsrr->num_input_setnames = req->num_inputResultSetNames; @@ -1603,13 +1748,13 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, 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 *) @@ -1650,16 +1795,24 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, odr_malloc (assoc->encode, sizeof(*bdrr)); Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); - logf(LOG_LOG, "Got DeleteRequest."); + yaz_log(LOG_LOG, "Got DeleteRequest."); bdrr->num_setnames = req->num_resultSetList; bdrr->setnames = req->resultSetList; bdrr->stream = assoc->encode; + bdrr->print = assoc->print; bdrr->function = *req->deleteFunction; bdrr->referenceId = req->referenceId; - - ((int (*)(void *, bend_delete_rr *)) - (*assoc->bend_delete))(assoc->backend, bdrr); + bdrr->statuses = 0; + if (bdrr->num_setnames > 0) + { + int i; + bdrr->statuses = odr_malloc(assoc->encode, sizeof(*bdrr->statuses) * + bdrr->num_setnames); + for (i = 0; i < bdrr->num_setnames; i++) + bdrr->statuses[i] = 0; + } + (*assoc->init->bend_delete)(assoc->backend, bdrr); res->referenceId = req->referenceId; @@ -1668,6 +1821,27 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, *res->deleteOperationStatus = bdrr->delete_status; res->deleteListStatuses = 0; + if (bdrr->num_setnames > 0) + { + int i; + res->deleteListStatuses = odr_malloc(assoc->encode, + sizeof(*res->deleteListStatuses)); + res->deleteListStatuses->num = bdrr->num_setnames; + res->deleteListStatuses->elements = + odr_malloc (assoc->encode, + sizeof(*res->deleteListStatuses->elements) * + bdrr->num_setnames); + for (i = 0; inum_setnames; i++) + { + res->deleteListStatuses->elements[i] = + odr_malloc (assoc->encode, + sizeof(**res->deleteListStatuses->elements)); + res->deleteListStatuses->elements[i]->status = bdrr->statuses+i; + res->deleteListStatuses->elements[i]->id = + odr_strdup (assoc->encode, bdrr->setnames[i]); + + } + } res->numberNotDeleted = 0; res->bulkStatuses = 0; res->deleteMessage = 0; @@ -1695,7 +1869,7 @@ static void process_close(association *assoc, request *reqb) "unspecified" }; - logf(LOG_LOG, "Got Close, reason %s, message %s", + yaz_log(LOG_LOG, "Got Close, reason %s, message %s", reasons[*req->closeReason], req->diagnosticInformation ? req->diagnosticInformation : "NULL"); if (assoc->version < 3) /* to make do_force respond with close */ @@ -1752,7 +1926,12 @@ void bend_request_destroy (bend_request *req) 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) @@ -1765,6 +1944,21 @@ void *bend_request_getdata(bend_request r) return r->clientData; } +static Z_APDU *process_segmentRequest (association *assoc, request *reqb) +{ + bend_segment_rr request; + + request.segment = reqb->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; @@ -1774,18 +1968,19 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse; - logf(LOG_DEBUG,"inside Process esRequest"); + yaz_log(LOG_DEBUG,"inside Process esRequest"); esrequest.esr = reqb->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.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) @@ -1796,13 +1991,13 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) if (esrequest.errcode == -1) { /* Backend service indicates request will be processed */ - logf(LOG_DEBUG,"Request could be processed...Accepted !"); + yaz_log(LOG_DEBUG,"Request could be processed...Accepted !"); *resp->operationStatus = Z_ExtendedServicesResponse_accepted; } else if (esrequest.errcode == 0) { /* Backend service indicates request will be processed */ - logf(LOG_DEBUG,"Request could be processed...Done !"); + yaz_log(LOG_DEBUG,"Request could be processed...Done !"); *resp->operationStatus = Z_ExtendedServicesResponse_done; } else @@ -1811,13 +2006,13 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) esrequest.errstring); /* Backend indicates error, request will not be processed */ - logf(LOG_DEBUG,"Request could not be processed...failure !"); + yaz_log(LOG_DEBUG,"Request could not be processed...failure !"); *resp->operationStatus = Z_ExtendedServicesResponse_failure; resp->num_diagnostics = diagRecs->num_diagRecs; resp->diagnostics = diagRecs->diagRecs; } /* Do something with the members of bend_extendedservice */ - logf(LOG_DEBUG,"Send the result apdu"); + yaz_log(LOG_DEBUG,"Send the result apdu"); return apdu; }