X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=55283258cf7c501a48af476a80cabe60d0a735cc;hp=64eeae1539475042066473a1a8490eb0e9405032;hb=f2b3c045e79a30c889ffdddb408d9d08ab8d7e01;hpb=437e30b2d7d34613611192acf4eb7e3be153b3b9 diff --git a/src/seshigh.c b/src/seshigh.c index 64eeae1..5528325 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: seshigh.c,v 1.46 2005-01-19 09:18:08 adam Exp $ */ /** * \file seshigh.c @@ -50,24 +48,33 @@ #include #endif +#if YAZ_HAVE_XML2 +#include +#include +#endif + #include #include #include #include "eventl.h" #include "session.h" +#include "mime.h" #include -#include +#include #include #include +#include #include #include #include #include #include #include +#include #include #include +#include static void process_gdu_request(association *assoc, request *req); static int process_z_request(association *assoc, request *req, char **msg); @@ -76,7 +83,7 @@ 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_External *init_diagnostics(ODR odr, int errcode, - const char *errstring); + const char *errstring); static Z_APDU *process_searchRequest(association *assoc, request *reqb, int *fd); static Z_APDU *response_searchRequest(association *assoc, request *reqb, @@ -86,39 +93,45 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd); static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd); static void process_close(association *assoc, request *reqb); -void save_referenceId (request *reqb, Z_ReferenceId *refid); +void save_referenceId(request *reqb, Z_ReferenceId *refid); static Z_APDU *process_deleteRequest(association *assoc, request *reqb, int *fd); -static Z_APDU *process_segmentRequest (association *assoc, request *reqb); - -static FILE *apduf = 0; /* for use in static mode */ -static statserv_options_block *control_block = 0; +static Z_APDU *process_segmentRequest(association *assoc, request *reqb); static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd); /* dynamic logging levels */ static int logbits_set = 0; -static int log_session = 0; +static int log_session = 0; /* one-line logs for session */ +static int log_sessiondetail = 0; /* more detailed stuff */ static int log_request = 0; /* one-line logs for requests */ static int log_requestdetail = 0; /* more detailed stuff */ /** get_logbits sets global loglevel bits */ -static void get_logbits() +static void get_logbits(void) { /* needs to be called after parsing cmd-line args that can set loglevels!*/ if (!logbits_set) { - logbits_set=1; - log_session=yaz_log_module_level("session"); - log_request=yaz_log_module_level("request"); - log_requestdetail=yaz_log_module_level("requestdetail"); + logbits_set = 1; + log_session = yaz_log_module_level("session"); + log_sessiondetail = yaz_log_module_level("sessiondetail"); + log_request = yaz_log_module_level("request"); + log_requestdetail = yaz_log_module_level("requestdetail"); } } + + static void wr_diag(WRBUF w, int error, const char *addinfo) { - wrbuf_printf(w, "ERROR [%d] %s%s%s", - error, diagbib1_str(error), - addinfo ? "--" : "", addinfo ? addinfo : ""); + wrbuf_printf(w, "ERROR %d+", error); + wrbuf_puts_replace_char(w, diagbib1_str(error), ' ', '_'); + if (addinfo){ + wrbuf_puts(w, "+"); + wrbuf_puts_replace_char(w, addinfo, ' ', '_'); + } + + wrbuf_puts(w, " "); } @@ -128,18 +141,18 @@ static void wr_diag(WRBUF w, int error, const char *addinfo) * link : communications channel. * Returns: 0 or a new association handle. */ -association *create_association(IOCHAN channel, COMSTACK link) +association *create_association(IOCHAN channel, COMSTACK link, + const char *apdufile) { association *anew; if (!logbits_set) get_logbits(); - if (!control_block) - control_block = statserv_getcontrol(); if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; anew->init = 0; anew->version = 0; + anew->last_control = 0; anew->client_chan = channel; anew->client_link = link; anew->cs_get_mask = 0; @@ -148,44 +161,26 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!(anew->decode = odr_createmem(ODR_DECODE)) || !(anew->encode = odr_createmem(ODR_ENCODE))) return 0; - if (*control_block->apdufile) + if (apdufile && *apdufile) { - char filename[256]; FILE *f; - strcpy(filename, control_block->apdufile); if (!(anew->print = odr_createmem(ODR_PRINT))) return 0; - if (*control_block->apdufile == '@') + if (*apdufile == '@') { odr_setprint(anew->print, yaz_log_file()); } - else if (*control_block->apdufile != '-') + else if (*apdufile != '-') { - strcpy(filename, control_block->apdufile); - if (!control_block->dynamic) - { - if (!apduf) - { - if (!(apduf = fopen(filename, "w"))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "can't open apdu dump %s", filename); - return 0; - } - setvbuf(apduf, 0, _IONBF, 0); - } - f = apduf; - } - else + char filename[256]; + sprintf(filename, "%.200s.%ld", apdufile, (long)getpid()); + if (!(f = fopen(filename, "w"))) { - sprintf(filename + strlen(filename), ".%ld", (long)getpid()); - if (!(f = fopen(filename, "w"))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename); - return 0; - } - setvbuf(f, 0, _IONBF, 0); + yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename); + return 0; } + setvbuf(f, 0, _IONBF, 0); odr_setprint(anew->print, f); } } @@ -198,6 +193,7 @@ association *create_association(IOCHAN channel, COMSTACK link) request_initq(&anew->incoming); request_initq(&anew->outgoing); anew->proto = cs_getproto(link); + anew->server = 0; return anew; } @@ -226,9 +222,9 @@ void destroy_association(association *h) request_delq(&h->outgoing); xfree(h); xmalloc_trav("session closed"); - if (control_block && control_block->one_shot) + if (cb && cb->one_shot) { - exit (0); + exit(0); } } @@ -257,6 +253,7 @@ static void do_close_req(association *a, int reason, char *message, request_release(req); yaz_log(log_requestdetail, "v2 client. No Close PDU"); iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */ + a->cs_put_mask = 0; } a->state = ASSOC_DEAD; } @@ -267,120 +264,74 @@ static void do_close(association *a, int reason, char *message) do_close_req (a, reason, message, req); } -/* - * This is where PDUs from the client are read and the further - * processing is initiated. Flow of control moves down through the - * various process_* functions below, until the encoded result comes back up - * to the output handler in here. - * - * h : the I/O channel that has an outstanding event. - * event : the current outstanding event. - */ -void ir_session(IOCHAN h, int event) + +int ir_read(IOCHAN h, int event) { - int res; association *assoc = (association *)iochan_getdata(h); COMSTACK conn = assoc->client_link; request *req; - - assert(h && conn && assoc); - if (event == EVENT_TIMEOUT) + + if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask)) { - if (assoc->state != ASSOC_UP) + yaz_log(YLOG_DEBUG, "ir_session (input)"); + /* We aren't speaking to this fellow */ + if (assoc->state == ASSOC_DEAD) { - yaz_log(YLOG_DEBUG, "Final timeout - closing connection."); - /* do we need to lod this at all */ + yaz_log(log_sessiondetail, "Connection closed - end of session"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); + return 0; } - else - { - yaz_log(log_session, "Session idle too long. Sending close."); - do_close(assoc, Z_Close_lackOfActivity, 0); - } - return; - } - if (event & assoc->cs_accept_mask) - { - if (!cs_accept (conn)) - { - yaz_log (YLOG_WARN, "accept failed"); - destroy_association(assoc); - iochan_destroy(h); - } - iochan_clearflag (h, EVENT_OUTPUT); - if (conn->io_pending) - { /* cs_accept didn't complete */ - assoc->cs_accept_mask = - ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | - ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); + assoc->cs_get_mask = EVENT_INPUT; - iochan_setflag (h, assoc->cs_accept_mask); - } - else - { /* cs_accept completed. Prepare for reading (cs_get) */ - assoc->cs_accept_mask = 0; - assoc->cs_get_mask = EVENT_INPUT; - iochan_setflag (h, assoc->cs_get_mask); - } - return; - } - if ((event & assoc->cs_get_mask) || (event & EVENT_WORK)) /* input */ - { - if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask)) + do { - yaz_log(YLOG_DEBUG, "ir_session (input)"); - /* We aren't speaking to this fellow */ - if (assoc->state == ASSOC_DEAD) + int res = cs_get(conn, &assoc->input_buffer, + &assoc->input_buffer_len); + if (res < 0 && cs_errno(conn) == CSBUFSIZE) { - yaz_log(log_session, "Connection closed - end of session"); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - return; + yaz_log(log_session, "Connection error: %s res=%d", + cs_errmsg(cs_errno(conn)), res); + req = request_get(&assoc->incoming); /* get a new request */ + do_close_req(assoc, Z_Close_protocolError, + "Incoming package too large", req); + return 0; } - assoc->cs_get_mask = EVENT_INPUT; - if ((res = cs_get(conn, &assoc->input_buffer, - &assoc->input_buffer_len)) <= 0) + else if (res <= 0) { yaz_log(log_session, "Connection closed by client"); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - return; + assoc->state = ASSOC_DEAD; + return 0; } else if (res == 1) /* incomplete read - wait for more */ { if (conn->io_pending & CS_WANT_WRITE) assoc->cs_get_mask |= EVENT_OUTPUT; iochan_setflag(h, assoc->cs_get_mask); - return; + return 0; } - if (cs_more(conn)) /* more stuff - call us again later, please */ - iochan_setevent(h, EVENT_INPUT); - /* we got a complete PDU. Let's decode it */ yaz_log(YLOG_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); + assoc->input_buffer[0] & 0xff, + assoc->input_buffer[1] & 0xff, + assoc->input_buffer[2] & 0xff); req = request_get(&assoc->incoming); /* get a new request */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0)) { yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] " - "[near byte %d] ", + "[near byte %ld] ", odr_errmsg(odr_geterror(assoc->decode)), odr_getelement(assoc->decode), - odr_offset(assoc->decode)); + (long) odr_offset(assoc->decode)); if (assoc->decode->error != OHTTP) { yaz_log(YLOG_WARN, "PDU dump:"); odr_dumpBER(yaz_log_file(), assoc->input_buffer, res); request_release(req); - do_close(assoc, Z_Close_protocolError,"Malformed package"); + do_close(assoc, Z_Close_protocolError, "Malformed package"); } else { @@ -388,20 +339,88 @@ void ir_session(IOCHAN h, int event) assoc->state = ASSOC_DEAD; process_gdu_response(assoc, req, p); } - return; + return 0; } req->request_mem = odr_extract_mem(assoc->decode); if (assoc->print) { if (!z_GDU(assoc->print, &req->gdu_request, 0, 0)) yaz_log(YLOG_WARN, "ODR print error: %s", - odr_errmsg(odr_geterror(assoc->print))); + odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } request_enq(&assoc->incoming, req); } + while (cs_more(conn)); + } + return 1; +} + +/* + * This is where PDUs from the client are read and the further + * processing is initiated. Flow of control moves down through the + * various process_* functions below, until the encoded result comes back up + * to the output handler in here. + * + * h : the I/O channel that has an outstanding event. + * event : the current outstanding event. + */ +void ir_session(IOCHAN h, int event) +{ + int res; + association *assoc = (association *)iochan_getdata(h); + COMSTACK conn = assoc->client_link; + request *req; + + assert(h && conn && assoc); + if (event == EVENT_TIMEOUT) + { + if (assoc->state != ASSOC_UP) + { + yaz_log(YLOG_DEBUG, "Final timeout - closing connection."); + /* do we need to lod this at all */ + cs_close(conn); + destroy_association(assoc); + iochan_destroy(h); + } + else + { + yaz_log(log_sessiondetail, + "Session idle too long. Sending close."); + do_close(assoc, Z_Close_lackOfActivity, 0); + } + return; + } + if (event & assoc->cs_accept_mask) + { + if (!cs_accept(conn)) + { + yaz_log(YLOG_WARN, "accept failed"); + destroy_association(assoc); + iochan_destroy(h); + return; + } + iochan_clearflag(h, EVENT_OUTPUT); + if (conn->io_pending) + { /* cs_accept didn't complete */ + assoc->cs_accept_mask = + ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | + ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); - /* can we do something yet? */ + iochan_setflag(h, assoc->cs_accept_mask); + } + else + { /* cs_accept completed. Prepare for reading (cs_get) */ + assoc->cs_accept_mask = 0; + assoc->cs_get_mask = EVENT_INPUT; + iochan_setflag(h, assoc->cs_get_mask); + } + return; + } + if (event & assoc->cs_get_mask) /* input */ + { + if (!ir_read(h, event)) + return; req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) { @@ -419,7 +438,7 @@ void ir_session(IOCHAN h, int event) switch (res = cs_put(conn, req->response, req->len_response)) { case -1: - yaz_log(log_session, "Connection closed by client"); + yaz_log(log_sessiondetail, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -464,10 +483,11 @@ void ir_session(IOCHAN h, int event) static int process_z_request(association *assoc, request *req, char **msg); + static void assoc_init_reset(association *assoc) { xfree (assoc->init); - assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); + assoc->init = (bend_initrequest *) xmalloc(sizeof(*assoc->init)); assoc->init->stream = assoc->encode; assoc->init->print = assoc->print; @@ -476,6 +496,8 @@ static void assoc_init_reset(association *assoc) assoc->init->implementation_version = 0; assoc->init->implementation_id = 0; assoc->init->implementation_name = 0; + assoc->init->query_charset = 0; + assoc->init->records_in_same_charset = 0; assoc->init->bend_sort = NULL; assoc->init->bend_search = NULL; assoc->init->bend_present = NULL; @@ -486,51 +508,173 @@ static void assoc_init_reset(association *assoc) assoc->init->bend_fetch = NULL; assoc->init->bend_explain = NULL; assoc->init->bend_srw_scan = NULL; + assoc->init->bend_srw_update = 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)); + odr_strdup(assoc->encode, cs_addrstr(assoc->client_link)); + + yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name); } -static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) +static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_SRW_PDU *sr) { - const char *encoding = "UTF-8"; - Z_External *ce; - bend_initresult *binitres; statserv_options_block *cb = statserv_getcontrol(); - - assoc_init_reset(assoc); + if (!assoc->init) + { + const char *encoding = "UTF-8"; + Z_External *ce; + bend_initresult *binitres; + + yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname); + assoc_init_reset(assoc); + + if (sr->username) + { + Z_IdAuthentication *auth = (Z_IdAuthentication *) + odr_malloc(assoc->decode, sizeof(*auth)); + int len; + + len = strlen(sr->username) + 1; + if (sr->password) + len += strlen(sr->password) + 2; + auth->which = Z_IdAuthentication_open; + auth->u.open = (char *) odr_malloc(assoc->decode, len); + strcpy(auth->u.open, sr->username); + if (sr->password && *sr->password) + { + strcat(auth->u.open, "/"); + strcat(auth->u.open, sr->password); + } + assoc->init->auth = auth; + } - assoc->maximumRecordSize = 3000000; - assoc->preferredMessageSize = 3000000; #if 1 - ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); - assoc->init->charneg_request = ce->u.charNeg3; + ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); + assoc->init->charneg_request = ce->u.charNeg3; #endif - assoc->backend = 0; - if (!(binitres = (*cb->bend_init)(assoc->init))) - { - assoc->state = ASSOC_DEAD; - yaz_add_srw_diagnostic(assoc->encode, d, num, 3, 0); - return 0; + assoc->backend = 0; + if (!(binitres = (*cb->bend_init)(assoc->init))) + { + assoc->state = ASSOC_DEAD; + yaz_add_srw_diagnostic(assoc->encode, d, num, + YAZ_SRW_AUTHENTICATION_ERROR, 0); + return 0; + } + assoc->backend = binitres->handle; + assoc->init->auth = 0; + if (binitres->errcode) + { + int srw_code = yaz_diag_bib1_to_srw(binitres->errcode); + assoc->state = ASSOC_DEAD; + yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code, + binitres->errstring); + return 0; + } + return 1; } - assoc->backend = binitres->handle; - if (binitres->errcode) + return 1; +} + +static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) +{ +#if YAZ_HAVE_XML2 + yaz_record_conv_t rc = 0; + const char *match_schema = 0; + Odr_oid *match_syntax = 0; + + if (assoc->server) { - assoc->state = ASSOC_DEAD; - yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode, - binitres->errstring); - return 0; + int r; + const char *input_schema = yaz_get_esn(rr->comp); + Odr_oid *input_syntax_raw = rr->request_format; + + const char *backend_schema = 0; + Odr_oid *backend_syntax = 0; + + r = yaz_retrieval_request(assoc->server->retrieval, + input_schema, + input_syntax_raw, + &match_schema, + &match_syntax, + &rc, + &backend_schema, + &backend_syntax); + if (r == -1) /* error ? */ + { + const char *details = yaz_retrieval_get_error( + assoc->server->retrieval); + + rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + if (details) + rr->errstring = odr_strdup(rr->stream, details); + return -1; + } + else if (r == 1 || r == 3) + { + const char *details = input_schema; + rr->errcode = + YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; + if (details) + rr->errstring = odr_strdup(rr->stream, details); + return -1; + } + else if (r == 2) + { + rr->errcode = YAZ_BIB1_RECORD_SYNTAX_UNSUPP; + if (input_syntax_raw) + { + char oidbuf[OID_STR_MAX]; + oid_oid_to_dotstring(input_syntax_raw, oidbuf); + rr->errstring = odr_strdup(rr->stream, oidbuf); + } + return -1; + } + if (backend_schema) + { + yaz_set_esn(&rr->comp, backend_schema, odr_getmem(rr->stream)); + } + if (backend_syntax) + rr->request_format = backend_syntax; + } + (*assoc->init->bend_fetch)(assoc->backend, rr); + if (rc && rr->record && rr->errcode == 0 && rr->len > 0) + { /* post conversion must take place .. */ + WRBUF output_record = wrbuf_alloc(); + int r = yaz_record_conv_record(rc, rr->record, rr->len, output_record); + if (r) + { + const char *details = yaz_record_conv_get_error(rc); + rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + if (details) + rr->errstring = odr_strdup(rr->stream, details); + } + else + { + rr->len = wrbuf_len(output_record); + rr->record = (char *) odr_malloc(rr->stream, rr->len); + memcpy(rr->record, wrbuf_buf(output_record), rr->len); + } + wrbuf_destroy(output_record); } - return 1; + if (match_syntax) + rr->output_format = match_syntax; + if (match_schema) + rr->schema = odr_strdup(rr->stream, match_schema); + return 0; +#else + (*assoc->init->bend_fetch)(assoc->backend, rr); +#endif + return 0; } static int srw_bend_fetch(association *assoc, int pos, Z_SRW_searchRetrieveRequest *srw_req, - Z_SRW_record *record) + Z_SRW_record *record, + const char **addinfo) { bend_fetch_rr rr; ODR o = assoc->encode; @@ -538,10 +682,8 @@ static int srw_bend_fetch(association *assoc, int pos, 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.request_format = odr_oiddup(assoc->decode, yaz_oid_recsyn_xml); + rr.comp = (Z_RecordComposition *) odr_malloc(assoc->decode, sizeof(*rr.comp)); rr.comp->which = Z_RecordComp_complex; @@ -581,8 +723,6 @@ static int srw_bend_fetch(association *assoc, int pos, 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; @@ -591,34 +731,12 @@ static int srw_bend_fetch(association *assoc, int pos, if (!assoc->init->bend_fetch) return 1; - (*assoc->init->bend_fetch)(assoc->backend, &rr); + retrieve_fetch(assoc, &rr); if (rr.errcode && rr.surrogate_flag) { int code = yaz_diag_bib1_to_srw(rr.errcode); - const char *message = yaz_diag_srw_str(code); - int len = 200; - if (message) - len += strlen(message); - if (rr.errstring) - len += strlen(rr.errstring); - - record->recordData_buf = odr_malloc(o, len); - - sprintf(record->recordData_buf, "\n" - " info:srw/diagnostic/1/%d\n", code); - if (rr.errstring) - sprintf(record->recordData_buf + strlen(record->recordData_buf), - "
%s
\n", rr.errstring); - if (message) - sprintf(record->recordData_buf + strlen(record->recordData_buf), - " %s\n", message); - sprintf(record->recordData_buf + strlen(record->recordData_buf), - "\n"); - record->recordData_len = strlen(record->recordData_buf); - record->recordPosition = odr_intdup(o, pos); - record->recordSchema = "info:srw/schema/1/diagnostics-v1.1"; + yaz_mk_sru_surrogate(o, record, pos, code, rr.errstring); return 0; } else if (rr.len >= 0) @@ -626,411 +744,935 @@ static int srw_bend_fetch(association *assoc, int pos, record->recordData_buf = rr.record; record->recordData_len = rr.len; record->recordPosition = odr_intdup(o, pos); - if (rr.schema) - record->recordSchema = odr_strdup(o, rr.schema); + record->recordSchema = odr_strdup_null( + o, rr.schema ? rr.schema : srw_req->recordSchema); + } + if (rr.errcode) + { + *addinfo = rr.errstring; + return rr.errcode; + } + return 0; +} + +static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, + Z_Query *query_result) +{ + /* have a CQL query and CQL to PQF transform .. */ + CQL_parser cp = cql_parser_create(); + int r; + int srw_errcode = 0; + const char *add = 0; + char rpn_buf[5120]; + + r = cql_parser_string(cp, cql); + if (r) + { + srw_errcode = YAZ_SRW_QUERY_SYNTAX_ERROR; + } + if (!r) + { + /* Syntax OK */ + r = cql_transform_buf(ct, + cql_parser_result(cp), + rpn_buf, sizeof(rpn_buf)-1); + if (r) + srw_errcode = cql_transform_error(ct, &add); + } + if (!r) + { + /* Syntax & transform OK. */ + /* Convert PQF string to Z39.50 to RPN query struct */ + YAZ_PQF_Parser pp = yaz_pqf_create(); + Z_RPNQuery *rpnquery = yaz_pqf_parse(pp, odr, rpn_buf); + if (!rpnquery) + { + size_t off; + const char *pqf_msg; + int code = yaz_pqf_error(pp, &pqf_msg, &off); + yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)", + pqf_msg, code); + srw_errcode = YAZ_SRW_QUERY_SYNTAX_ERROR; + } else - record->recordSchema = 0; + { + query_result->which = Z_Query_type_1; + query_result->u.type_1 = rpnquery; + } + yaz_pqf_destroy(pp); } - return rr.errcode; + cql_parser_destroy(cp); + return srw_errcode; } +static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, + Z_AttributesPlusTerm *result) +{ + Z_Query query; + Z_RPNQuery *rpn; + int srw_error = cql2pqf(odr, cql, ct, &query); + if (srw_error) + return srw_error; + if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101) + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* bad query type */ + rpn = query.u.type_1; + if (!rpn->RPNStructure) + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be structure */ + if (rpn->RPNStructure->which != Z_RPNStructure_simple) + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be simple */ + if (rpn->RPNStructure->u.simple->which != Z_Operand_APT) + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be be attributes + term */ + memcpy(result, rpn->RPNStructure->u.simple->u.attributesPlusTerm, + sizeof(*result)); + return 0; +} + + +static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset, + bend_search_rr *bsrr) { + char *ccl0; + struct ccl_rpn_node *node; + int errcode, pos; + + ccl0 = odr_strdupn(odr, (char*) ccl->buf, ccl->len); + if ((node = ccl_find_str(bibset, ccl0, &errcode, &pos)) == 0) { + bsrr->errstring = (char*) ccl_err_msg(errcode); + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* Query syntax error */ + } + + bsrr->query->which = Z_Query_type_1; + bsrr->query->u.type_1 = ccl_rpn_query(odr, node); + return 0; +} + + static void srw_bend_search(association *assoc, request *req, - Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_PDU *sr, Z_SRW_searchRetrieveResponse *srw_res, int *http_code) { int srw_error = 0; Z_External *ext; + Z_SRW_searchRetrieveRequest *srw_req = sr->u.request; *http_code = 200; yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest"); - if (!assoc->init) - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); - if (srw_req->sort_type != Z_SRW_sort_type_none) - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, 80, 0); - else if (srw_res->num_diagnostics == 0 && assoc->init) - { - bend_search_rr rr; - rr.setname = "default"; - rr.replace_set = 1; - rr.num_bases = 1; - rr.basenames = &srw_req->database; - rr.referenceId = 0; - - rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); - - if (srw_req->query_type == Z_SRW_query_type_cql) - { - 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; - ext->u.cql = srw_req->query.cql; - - rr.query->which = Z_Query_type_104; - rr.query->u.type_104 = ext; - } - else if (srw_req->query_type == Z_SRW_query_type_pqf) - { - Z_RPNQuery *RPNquery; - YAZ_PQF_Parser pqf_parser; - - pqf_parser = yaz_pqf_create (); - - RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, - srw_req->query.pqf); - if (!RPNquery) - { - const char *pqf_msg; - size_t off; - int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); - yaz_log(log_requestdetail, "Parse error %d %s near offset %d", - code, pqf_msg, off); - srw_error = 10; - } - - rr.query->which = Z_Query_type_1; - rr.query->u.type_1 = RPNquery; - - yaz_pqf_destroy (pqf_parser); - } - else - { - rr.query->u.type_1 = 0; - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, 11, 0); - } - if (rr.query->u.type_1) - { - 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_level(log_requestdetail,rr.query); - - (assoc->init->bend_search)(assoc->backend, &rr); - if (rr.errcode) - { - if (rr.errcode == 109) /* database unavailable */ - { - *http_code = 404; - } - else - { - srw_error = yaz_diag_bib1_to_srw (rr.errcode); - yaz_add_srw_diagnostic(assoc->encode, - &srw_res->diagnostics, - &srw_res->num_diagnostics, - srw_error, rr.errstring); - } - } - else - { - int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0; - int start = srw_req->startRecord ? *srw_req->startRecord : 1; - - yaz_log(log_requestdetail, "Request to pack %d+%d out of %d", - start, number, rr.hits); - - srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); - if (number > 0) - { - int i; - - if (start > rr.hits) - { - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 61, 0); - } - else - { - int j = 0; - int packing = Z_SRW_recordPacking_string; - if (start + number > rr.hits) - number = rr.hits - start + 1; - if (srw_req->recordPacking && - !strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - srw_res->records = (Z_SRW_record *) - odr_malloc(assoc->encode, - number * sizeof(*srw_res->records)); - for (i = 0; irecords[j].recordPacking = packing; - srw_res->records[j].recordData_buf = 0; - yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); - errcode = srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); - if (errcode) - { - yaz_add_srw_diagnostic(assoc->encode, - &srw_res->diagnostics, - &srw_res->num_diagnostics, - yaz_diag_bib1_to_srw (errcode), - rr.errstring); - - break; - } - if (srw_res->records[j].recordData_buf) - j++; - } - srw_res->num_records = j; - if (!j) - srw_res->records = 0; - } + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (srw_res->num_diagnostics == 0 && assoc->init) + { + bend_search_rr rr; + rr.setname = "default"; + rr.replace_set = 1; + rr.num_bases = 1; + rr.basenames = &srw_req->database; + rr.referenceId = 0; + rr.srw_sortKeys = 0; + rr.srw_setname = 0; + rr.srw_setnameIdleTime = 0; + rr.estimated_hit_count = 0; + rr.partial_resultset = 0; + rr.query = (Z_Query *) odr_malloc(assoc->decode, sizeof(*rr.query)); + rr.query->u.type_1 = 0; + + if (srw_req->query_type == Z_SRW_query_type_cql) + { + if (assoc->server && assoc->server->cql_transform) + { + int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql, + assoc->server->cql_transform, + rr.query); + if (srw_errcode) + { + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_errcode, 0); + } + } + else + { + /* CQL query to backend. Wrap it - Z39.50 style */ + 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; + ext->u.cql = srw_req->query.cql; + + rr.query->which = Z_Query_type_104; + rr.query->u.type_104 = ext; + } + } + else if (srw_req->query_type == Z_SRW_query_type_pqf) + { + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create(); + + RPNquery = yaz_pqf_parse(pqf_parser, assoc->decode, + srw_req->query.pqf); + if (!RPNquery) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); + yaz_log(log_requestdetail, "Parse error %d %s near offset %ld", + code, pqf_msg, (long) off); + srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR; + } + + rr.query->which = Z_Query_type_1; + rr.query->u.type_1 = RPNquery; + + yaz_pqf_destroy(pqf_parser); + } + else + { + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_UNSUPP_QUERY_TYPE, 0); + } + if (rr.query->u.type_1) + { + rr.stream = assoc->encode; + rr.decode = assoc->decode; + rr.print = assoc->print; + rr.request = req; + if ( srw_req->sort.sortKeys ) + rr.srw_sortKeys = odr_strdup(assoc->encode, + srw_req->sort.sortKeys ); + rr.association = assoc; + rr.fd = 0; + rr.hits = 0; + rr.errcode = 0; + rr.errstring = 0; + rr.search_info = 0; + yaz_log_zquery_level(log_requestdetail,rr.query); + + (assoc->init->bend_search)(assoc->backend, &rr); + if (rr.errcode) + { + if (rr.errcode == YAZ_BIB1_DATABASE_UNAVAILABLE) + { + *http_code = 404; + } + else + { + srw_error = yaz_diag_bib1_to_srw(rr.errcode); + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, rr.errstring); + } + } + else + { + int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0; + int start = srw_req->startRecord ? *srw_req->startRecord : 1; + + yaz_log(log_requestdetail, "Request to pack %d+%d out of %d", + start, number, rr.hits); + + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); + if (rr.srw_setname) + { + srw_res->resultSetId = + odr_strdup(assoc->encode, rr.srw_setname ); + srw_res->resultSetIdleTime = + odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - } - } + + if (start > rr.hits || start < 1) + { + /* if hits<=0 and start=1 we don't return a diagnostic */ + if (start != 1) + yaz_add_srw_diagnostic( + assoc->encode, + &srw_res->diagnostics, &srw_res->num_diagnostics, + YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + } + else if (number > 0) + { + int i; + int ok = 1; + if (start + number > rr.hits) + number = rr.hits - start + 1; + + /* Call bend_present if defined */ + if (assoc->init->bend_present) + { + bend_present_rr *bprr = (bend_present_rr*) + odr_malloc(assoc->decode, sizeof(*bprr)); + bprr->setname = "default"; + bprr->start = start; + bprr->number = number; + if (srw_req->recordSchema) + { + bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode, + sizeof(*bprr->comp)); + bprr->comp->which = Z_RecordComp_simple; + bprr->comp->u.simple = (Z_ElementSetNames *) + odr_malloc(assoc->decode, sizeof(Z_ElementSetNames)); + bprr->comp->u.simple->which = Z_ElementSetNames_generic; + bprr->comp->u.simple->u.generic = srw_req->recordSchema; + } + else + { + bprr->comp = 0; + } + bprr->stream = assoc->encode; + bprr->referenceId = 0; + bprr->print = assoc->print; + bprr->request = req; + bprr->association = assoc; + bprr->errcode = 0; + bprr->errstring = NULL; + (*assoc->init->bend_present)(assoc->backend, bprr); + + if (!bprr->request) + return; + if (bprr->errcode) + { + srw_error = yaz_diag_bib1_to_srw(bprr->errcode); + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, bprr->errstring); + ok = 0; + } + } + + if (ok) + { + int j = 0; + int packing = Z_SRW_recordPacking_string; + if (srw_req->recordPacking) + { + packing = + yaz_srw_str_to_pack(srw_req->recordPacking); + if (packing == -1) + packing = Z_SRW_recordPacking_string; + } + srw_res->records = (Z_SRW_record *) + odr_malloc(assoc->encode, + number * sizeof(*srw_res->records)); + + srw_res->extra_records = (Z_SRW_extra_record **) + odr_malloc(assoc->encode, + number*sizeof(*srw_res->extra_records)); + + for (i = 0; irecords[j].recordPacking = packing; + srw_res->records[j].recordData_buf = 0; + srw_res->extra_records[j] = 0; + yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); + errcode = srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j, + &addinfo); + if (errcode) + { + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + yaz_diag_bib1_to_srw(errcode), + addinfo); + + break; + } + if (srw_res->records[j].recordData_buf) + j++; + } + srw_res->num_records = j; + if (!j) + srw_res->records = 0; + } + } + if (rr.estimated_hit_count || rr.partial_resultset) + { + yaz_add_srw_diagnostic( + assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_RESULT_SET_CREATED_WITH_VALID_PARTIAL_RESULTS_AVAILABLE, + 0); + } + } + } } if (log_request) { - const char *querystr = "?"; - const char *querytype = "?"; + const char *querystr = "?"; + const char *querytype = "?"; WRBUF wr = wrbuf_alloc(); - switch (srw_req->query_type) - { - case Z_SRW_query_type_cql: - querytype = "CQL"; - querystr = srw_req->query.cql; - break; - case Z_SRW_query_type_pqf: - querytype = "PQF"; - querystr = srw_req->query.pqf; - break; - } - wrbuf_printf(wr, "SRWSearch "); + switch (srw_req->query_type) + { + case Z_SRW_query_type_cql: + querytype = "CQL"; + querystr = srw_req->query.cql; + break; + case Z_SRW_query_type_pqf: + querytype = "PQF"; + querystr = srw_req->query.pqf; + break; + } + wrbuf_printf(wr, "SRWSearch %s ", srw_req->database); if (srw_res->num_diagnostics) wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri); - else if (*http_code != 200) - wrbuf_printf(wr, "ERROR info:http/%d", *http_code); + else if (*http_code != 200) + wrbuf_printf(wr, "ERROR info:http/%d", *http_code); else if (srw_res->numberOfRecords) - { + { wrbuf_printf(wr, "OK %d", - (srw_res->numberOfRecords ? - *srw_res->numberOfRecords : 0)); + (srw_res->numberOfRecords ? + *srw_res->numberOfRecords : 0)); + } + wrbuf_printf(wr, " %s %d+%d", + (srw_res->resultSetId ? + srw_res->resultSetId : "-"), + (srw_req->startRecord ? *srw_req->startRecord : 1), + srw_res->num_records); + yaz_log(log_request, "%s %s: %s", wrbuf_cstr(wr), querytype, querystr); + wrbuf_destroy(wr); + } +} + +static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) +{ +#if YAZ_HAVE_XML2 + xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr; + if (!ptr) + return 0; + for (ptr = ptr->children; ptr; ptr = ptr->next) + { + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) ptr->name, "explain")) + { + int len; + xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0"); + xmlChar *buf_out; + char *content; + + ptr = xmlCopyNode(ptr, 1); + + xmlDocSetRootElement(doc, ptr); + + xmlDocDumpMemory(doc, &buf_out, &len); + content = (char*) odr_malloc(rr->stream, 1+len); + memcpy(content, buf_out, len); + content[len] = '\0'; + + xmlFree(buf_out); + xmlFreeDoc(doc); + rr->explain_buf = content; + return 0; + } + } +#endif + return 0; +} + +static void srw_bend_explain(association *assoc, request *req, + Z_SRW_PDU *sr, + Z_SRW_explainResponse *srw_res, + int *http_code) +{ + Z_SRW_explainRequest *srw_req = sr->u.explain_request; + yaz_log(log_requestdetail, "Got SRW ExplainRequest"); + *http_code = 404; + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (assoc->init) + { + bend_explain_rr rr; + + rr.stream = assoc->encode; + rr.decode = assoc->decode; + rr.print = assoc->print; + rr.explain_buf = 0; + rr.database = srw_req->database; + if (assoc->server) + rr.server_node_ptr = assoc->server->server_node_ptr; + else + rr.server_node_ptr = 0; + rr.schema = "http://explain.z3950.org/dtd/2.0/"; + if (assoc->init->bend_explain) + (*assoc->init->bend_explain)(assoc->backend, &rr); + else + srw_bend_explain_default(assoc->backend, &rr); + + if (rr.explain_buf) + { + int packing = Z_SRW_recordPacking_string; + if (srw_req->recordPacking) + { + packing = + yaz_srw_str_to_pack(srw_req->recordPacking); + if (packing == -1) + packing = Z_SRW_recordPacking_string; + } + srw_res->record.recordSchema = rr.schema; + srw_res->record.recordPacking = packing; + srw_res->record.recordData_buf = rr.explain_buf; + srw_res->record.recordData_len = strlen(rr.explain_buf); + srw_res->record.recordPosition = 0; + *http_code = 200; + } + } +} + +static void srw_bend_scan(association *assoc, request *req, + Z_SRW_PDU *sr, + Z_SRW_scanResponse *srw_res, + int *http_code) +{ + Z_SRW_scanRequest *srw_req = sr->u.scan_request; + yaz_log(log_requestdetail, "Got SRW ScanRequest"); + + *http_code = 200; + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (srw_res->num_diagnostics == 0 && assoc->init) + { + struct scan_entry *save_entries; + + bend_scan_rr *bsrr = (bend_scan_rr *) + odr_malloc(assoc->encode, sizeof(*bsrr)); + bsrr->num_bases = 1; + bsrr->basenames = &srw_req->database; + + bsrr->num_entries = srw_req->maximumTerms ? + *srw_req->maximumTerms : 10; + bsrr->term_position = srw_req->responsePosition ? + *srw_req->responsePosition : 1; + + bsrr->errcode = 0; + bsrr->errstring = 0; + bsrr->referenceId = 0; + bsrr->stream = assoc->encode; + bsrr->print = assoc->print; + bsrr->step_size = odr_intdup(assoc->decode, 0); + bsrr->entries = 0; + bsrr->setname = 0; + + if (bsrr->num_entries > 0) + { + int i; + bsrr->entries = (struct scan_entry *) + odr_malloc(assoc->decode, sizeof(*bsrr->entries) * + bsrr->num_entries); + for (i = 0; inum_entries; i++) + { + bsrr->entries[i].term = 0; + bsrr->entries[i].occurrences = 0; + bsrr->entries[i].errcode = 0; + bsrr->entries[i].errstring = 0; + bsrr->entries[i].display_term = 0; + } + } + save_entries = bsrr->entries; /* save it so we can compare later */ + + if (srw_req->query_type == Z_SRW_query_type_pqf && + assoc->init->bend_scan) + { + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + + bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode, + &bsrr->attributeset, + srw_req->scanClause.pqf); + yaz_pqf_destroy(pqf_parser); + bsrr->scanClause = 0; + ((int (*)(void *, bend_scan_rr *)) + (*assoc->init->bend_scan))(assoc->backend, bsrr); + } + else if (srw_req->query_type == Z_SRW_query_type_cql + && assoc->init->bend_scan && assoc->server + && assoc->server->cql_transform) + { + int srw_error; + bsrr->scanClause = 0; + bsrr->attributeset = 0; + bsrr->term = (Z_AttributesPlusTerm *) + odr_malloc(assoc->decode, sizeof(*bsrr->term)); + srw_error = cql2pqf_scan(assoc->encode, + srw_req->scanClause.cql, + assoc->server->cql_transform, + bsrr->term); + if (srw_error) + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, 0); + else + { + ((int (*)(void *, bend_scan_rr *)) + (*assoc->init->bend_scan))(assoc->backend, bsrr); + } + } + else if (srw_req->query_type == Z_SRW_query_type_cql + && assoc->init->bend_srw_scan) + { + bsrr->term = 0; + bsrr->attributeset = 0; + bsrr->scanClause = srw_req->scanClause.cql; + ((int (*)(void *, bend_scan_rr *)) + (*assoc->init->bend_srw_scan))(assoc->backend, bsrr); + } + else + { + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_UNSUPP_OPERATION, "scan"); + } + if (bsrr->errcode) + { + int srw_error; + if (bsrr->errcode == YAZ_BIB1_DATABASE_UNAVAILABLE) + { + *http_code = 404; + return; + } + srw_error = yaz_diag_bib1_to_srw(bsrr->errcode); + + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, bsrr->errstring); + } + else if (srw_res->num_diagnostics == 0 && bsrr->num_entries) + { + int i; + srw_res->terms = (Z_SRW_scanTerm*) + odr_malloc(assoc->encode, sizeof(*srw_res->terms) * + bsrr->num_entries); + + srw_res->num_terms = bsrr->num_entries; + for (i = 0; inum_entries; i++) + { + Z_SRW_scanTerm *t = srw_res->terms + i; + t->value = odr_strdup(assoc->encode, bsrr->entries[i].term); + t->numberOfRecords = + odr_intdup(assoc->encode, bsrr->entries[i].occurrences); + t->displayTerm = 0; + if (save_entries == bsrr->entries && + bsrr->entries[i].display_term) + { + /* the entries was _not_ set by the handler. So it's + safe to test for new member display_term. It is + NULL'ed by us. + */ + t->displayTerm = odr_strdup(assoc->encode, + bsrr->entries[i].display_term); + } + t->whereInList = 0; + } + } + } + if (log_request) + { + WRBUF wr = wrbuf_alloc(); + const char *querytype = 0; + const char *querystr = 0; + + switch(srw_req->query_type) + { + case Z_SRW_query_type_pqf: + querytype = "PQF"; + querystr = srw_req->scanClause.pqf; + break; + case Z_SRW_query_type_cql: + querytype = "CQL"; + querystr = srw_req->scanClause.cql; + break; + default: + querytype = "UNKNOWN"; + querystr = ""; + } + + wrbuf_printf(wr, "SRWScan %s ", srw_req->database); + + if (srw_res->num_diagnostics) + wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri); + else if (srw_res->num_terms) + wrbuf_printf(wr, "OK %d - ", srw_res->num_terms); + else + wrbuf_printf(wr, "OK - - "); + + wrbuf_printf(wr, "%d+%d+0 ", + (srw_req->responsePosition ? + *srw_req->responsePosition : 1), + (srw_req->maximumTerms ? + *srw_req->maximumTerms : 1)); + /* there is no step size in SRU/W ??? */ + wrbuf_printf(wr, "%s: %s ", querytype, querystr); + yaz_log(log_request, "%s ", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); + } + +} + +static void srw_bend_update(association *assoc, request *req, + Z_SRW_PDU *sr, + Z_SRW_updateResponse *srw_res, + int *http_code) +{ + Z_SRW_updateRequest *srw_req = sr->u.update_request; + yaz_log(log_session, "SRWUpdate action=%s", srw_req->operation); + yaz_log(YLOG_DEBUG, "num_diag = %d", srw_res->num_diagnostics ); + *http_code = 404; + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (assoc->init) + { + bend_update_rr rr; + Z_SRW_extra_record *extra = srw_req->extra_record; + + rr.stream = assoc->encode; + rr.print = assoc->print; + rr.num_bases = 1; + rr.basenames = &srw_req->database; + rr.operation = srw_req->operation; + rr.operation_status = "failed"; + rr.record_id = 0; + rr.record_versions = 0; + rr.num_versions = 0; + rr.record_packing = "string"; + rr.record_schema = 0; + rr.record_data = 0; + rr.extra_record_data = 0; + rr.extra_request_data = 0; + rr.extra_response_data = 0; + rr.uri = 0; + rr.message = 0; + rr.details = 0; + + *http_code = 200; + if (rr.operation == 0) + { + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + "action" ); + return; + } + yaz_log(YLOG_DEBUG, "basename = %s", rr.basenames[0] ); + yaz_log(YLOG_DEBUG, "Operation = %s", rr.operation ); + if (!strcmp( rr.operation, "delete")) + { + if (srw_req->record && !srw_req->record->recordSchema) + { + rr.record_schema = odr_strdup( + assoc->encode, + srw_req->record->recordSchema); + } + if (srw_req->record) + { + rr.record_data = odr_strdupn( + assoc->encode, + srw_req->record->recordData_buf, + srw_req->record->recordData_len ); + } + if (extra && extra->extraRecordData_len) + { + rr.extra_record_data = odr_strdupn( + assoc->encode, + extra->extraRecordData_buf, + extra->extraRecordData_len ); + } + if (srw_req->recordId) + rr.record_id = srw_req->recordId; + else if (extra && extra->recordIdentifier) + rr.record_id = extra->recordIdentifier; + } + else if (!strcmp(rr.operation, "replace")) + { + if (srw_req->recordId) + rr.record_id = srw_req->recordId; + else if (extra && extra->recordIdentifier) + rr.record_id = extra->recordIdentifier; + else + { + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + "recordIdentifier"); + } + if (!srw_req->record) + { + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + "record"); + } + else + { + if (srw_req->record->recordSchema) + rr.record_schema = odr_strdup( + assoc->encode, srw_req->record->recordSchema); + if (srw_req->record->recordData_len ) + { + rr.record_data = odr_strdupn(assoc->encode, + srw_req->record->recordData_buf, + srw_req->record->recordData_len ); + } + else + { + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + "recordData" ); + } + } + if (extra && extra->extraRecordData_len) + { + rr.extra_record_data = odr_strdupn( + assoc->encode, + extra->extraRecordData_buf, + extra->extraRecordData_len ); + } + } + else if (!strcmp(rr.operation, "insert")) + { + if (srw_req->recordId) + rr.record_id = srw_req->recordId; + else if (extra) + rr.record_id = extra->recordIdentifier; + + if (srw_req->record) + { + if (srw_req->record->recordSchema) + rr.record_schema = odr_strdup( + assoc->encode, srw_req->record->recordSchema); + + if (srw_req->record->recordData_len) + rr.record_data = odr_strdupn( + assoc->encode, + srw_req->record->recordData_buf, + srw_req->record->recordData_len ); + } + if (extra && extra->extraRecordData_len) + { + rr.extra_record_data = odr_strdupn( + assoc->encode, + extra->extraRecordData_buf, + extra->extraRecordData_len ); + } } - wrbuf_printf(wr, " %s %d+%d", - (srw_res->resultSetId ? - srw_res->resultSetId : "-"), - (srw_req->startRecord ? *srw_req->startRecord : 1), - srw_res->num_records); - yaz_log(log_request, "%s %s: %s", wrbuf_buf(wr), querytype, querystr); - wrbuf_free(wr, 1); - } -} + else + yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_INVALID_ACTION, + rr.operation ); -static void srw_bend_explain(association *assoc, request *req, - Z_SRW_explainRequest *srw_req, - Z_SRW_explainResponse *srw_res, - int *http_code) -{ - yaz_log(log_requestdetail, "Got SRW ExplainRequest"); - *http_code = 404; - if (!assoc->init) - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); - if (assoc->init && assoc->init->bend_explain) - { - bend_explain_rr rr; + if (srw_req->record) + { + const char *pack_str = + yaz_srw_pack_to_str(srw_req->record->recordPacking); + if (pack_str) + rr.record_packing = odr_strdup(assoc->encode, pack_str); + } - rr.stream = assoc->encode; - rr.decode = assoc->decode; - rr.print = assoc->print; - rr.explain_buf = 0; - rr.database = srw_req->database; - rr.schema = "http://explain.z3950.org/dtd/2.0/"; - (*assoc->init->bend_explain)(assoc->backend, &rr); - if (rr.explain_buf) + if (srw_req->num_recordVersions) { - int packing = Z_SRW_recordPacking_string; - if (srw_req->recordPacking && - !strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - srw_res->record.recordSchema = rr.schema; - srw_res->record.recordPacking = packing; - srw_res->record.recordData_buf = rr.explain_buf; - srw_res->record.recordData_len = strlen(rr.explain_buf); - srw_res->record.recordPosition = 0; - *http_code = 200; + rr.record_versions = srw_req->recordVersions; + rr.num_versions = srw_req->num_recordVersions; + } + if (srw_req->extraRequestData_len) + { + rr.extra_request_data = odr_strdupn(assoc->encode, + srw_req->extraRequestData_buf, + srw_req->extraRequestData_len ); + } + if (srw_res->num_diagnostics == 0) + { + if ( assoc->init->bend_srw_update) + (*assoc->init->bend_srw_update)(assoc->backend, &rr); + else + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_UNSPECIFIED_DATABASE_ERROR, + "No Update backend handler"); } - } -} -static void srw_bend_scan(association *assoc, request *req, - Z_SRW_scanRequest *srw_req, - Z_SRW_scanResponse *srw_res, - int *http_code) -{ - yaz_log(log_requestdetail, "Got SRW ScanRequest"); + if (rr.uri) + yaz_add_srw_diagnostic_uri(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + rr.uri, + rr.message, + rr.details); + srw_res->recordId = rr.record_id; + srw_res->operationStatus = rr.operation_status; + srw_res->recordVersions = rr.record_versions; + srw_res->num_recordVersions = rr.num_versions; + if (srw_res->extraResponseData_len) + { + srw_res->extraResponseData_buf = rr.extra_response_data; + srw_res->extraResponseData_len = strlen(rr.extra_response_data); + } + if (srw_res->num_diagnostics == 0 && rr.record_data) + { + srw_res->record = yaz_srw_get_record(assoc->encode); + srw_res->record->recordSchema = rr.record_schema; + if (rr.record_packing) + { + int pack = yaz_srw_str_to_pack(rr.record_packing); - *http_code = 200; - if (!assoc->init) - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); - if (srw_res->num_diagnostics == 0 && assoc->init) - { - struct scan_entry *save_entries; - - bend_scan_rr *bsrr = (bend_scan_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); - bsrr->num_bases = 1; - bsrr->basenames = &srw_req->database; - - bsrr->num_entries = srw_req->maximumTerms ? - *srw_req->maximumTerms : 10; - bsrr->term_position = srw_req->responsePosition ? - *srw_req->responsePosition : 1; - - bsrr->errcode = 0; - bsrr->errstring = 0; - bsrr->referenceId = 0; - bsrr->stream = assoc->encode; - bsrr->print = assoc->print; - bsrr->step_size = odr_intdup(assoc->decode, 0); - bsrr->entries = 0; - - if (bsrr->num_entries > 0) - { - int i; - bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) * - bsrr->num_entries); - for (i = 0; inum_entries; i++) - { - bsrr->entries[i].term = 0; - bsrr->entries[i].occurrences = 0; - bsrr->entries[i].errcode = 0; - bsrr->entries[i].errstring = 0; - bsrr->entries[i].display_term = 0; - } - } - save_entries = bsrr->entries; /* save it so we can compare later */ - - if (srw_req->query_type == Z_SRW_query_type_pqf && - assoc->init->bend_scan) - { - Odr_oid *scan_attributeSet = 0; - oident *attset; - YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); - - bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode, - &scan_attributeSet, - srw_req->scanClause.pqf); - if (scan_attributeSet && - (attset = oid_getentbyoid(scan_attributeSet)) && - (attset->oclass == CLASS_ATTSET || - attset->oclass == CLASS_GENERAL)) - bsrr->attributeset = attset->value; - else - bsrr->attributeset = VAL_NONE; - yaz_pqf_destroy(pqf_parser); - bsrr->scanClause = 0; - ((int (*)(void *, bend_scan_rr *)) - (*assoc->init->bend_scan))(assoc->backend, bsrr); - } - else if (srw_req->query_type == Z_SRW_query_type_cql - && assoc->init->bend_srw_scan) - { - bsrr->term = 0; - bsrr->attributeset = VAL_NONE; - bsrr->scanClause = srw_req->scanClause.cql; - ((int (*)(void *, bend_scan_rr *)) - (*assoc->init->bend_srw_scan))(assoc->backend, bsrr); - } - else - { - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, 4, "scan"); - } - if (bsrr->errcode) - { - int srw_error; - if (bsrr->errcode == 109) /* database unavailable */ - { - *http_code = 404; - return; - } - srw_error = yaz_diag_bib1_to_srw (bsrr->errcode); - - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - srw_error, bsrr->errstring); - } - else if (srw_res->num_diagnostics == 0 && bsrr->num_entries) - { - int i; - srw_res->terms = (Z_SRW_scanTerm*) - odr_malloc(assoc->encode, sizeof(*srw_res->terms) * - bsrr->num_entries); - - srw_res->num_terms = bsrr->num_entries; - for (i = 0; inum_entries; i++) - { - Z_SRW_scanTerm *t = srw_res->terms + i; - t->value = odr_strdup(assoc->encode, bsrr->entries[i].term); - t->numberOfRecords = - odr_intdup(assoc->encode, bsrr->entries[i].occurrences); - t->displayTerm = 0; - if (save_entries == bsrr->entries && - bsrr->entries[i].display_term) + if (pack == -1) { - /* the entries was _not_ set by the handler. So it's - safe to test for new member display_term. It is - NULL'ed by us. - */ - t->displayTerm = odr_strdup(assoc->encode, - bsrr->entries[i].display_term); + pack = Z_SRW_recordPacking_string; + yaz_log(YLOG_WARN, "Back packing %s from backend", + rr.record_packing); } - t->whereInList = 0; - } - } - } - if (log_request) - { - WRBUF wr = wrbuf_alloc(); - const char *querytype = 0; - const char *querystr = 0; - - switch(srw_req->query_type) - { - case Z_SRW_query_type_pqf: - querytype = "PQF"; - querystr = srw_req->scanClause.pqf; - break; - case Z_SRW_query_type_cql: - querytype = "CQL"; - querystr = srw_req->scanClause.cql; - break; - default: - querytype = "Unknown"; - querystr = ""; - } - wrbuf_printf(wr, "SRWScan %d+%d", - (srw_req->responsePosition ? - *srw_req->responsePosition : 1), - (srw_req->maximumTerms ? - *srw_req->maximumTerms : 1)); - if (srw_res->num_diagnostics) - wrbuf_printf(wr, " ERROR %s", srw_res->diagnostics[0].uri); - else - wrbuf_printf(wr, " OK -"); - wrbuf_printf(wr, " %s: %s", querytype, querystr); - yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + srw_res->record->recordPacking = pack; + } + srw_res->record->recordData_buf = rr.record_data; + srw_res->record->recordData_len = strlen(rr.record_data); + if (rr.extra_record_data) + { + Z_SRW_extra_record *ex = + yaz_srw_get_extra_record(assoc->encode); + srw_res->extra_record = ex; + ex->extraRecordData_buf = rr.extra_record_data; + ex->extraRecordData_len = strlen(rr.extra_record_data); + } + } } +} +/* check if path is OK (1); BAD (0) */ +static int check_path(const char *path) +{ + if (*path != '/') + return 0; + if (strstr(path, "..")) + return 0; + return 1; } +static char *read_file(const char *fname, ODR o, size_t *sz) +{ + char *buf; + FILE *inf = fopen(fname, "rb"); + if (!inf) + return 0; + + fseek(inf, 0L, SEEK_END); + *sz = ftell(inf); + rewind(inf); + buf = (char *) odr_malloc(o, *sz); + if (fread(buf, 1, *sz, inf) != *sz) + yaz_log(YLOG_WARN|YLOG_ERRNO, "short read %s", fname); + fclose(inf); + return buf; +} static void process_http_request(association *assoc, request *req) { @@ -1043,18 +1685,76 @@ static void process_http_request(association *assoc, request *req) char *charset = 0; Z_HTTP_Response *hres = 0; int keepalive = 1; - char *stylesheet = 0; + const char *stylesheet = 0; /* for now .. set later */ Z_SRW_diagnostic *diagnostic = 0; int num_diagnostic = 0; + const char *host = z_HTTP_header_lookup(hreq->headers, "Host"); - if (!strcmp(hreq->path, "/test")) + if (!control_association(assoc, host, 0)) + { + p = z_get_HTTP_Response(o, 404); + r = 1; + } + if (r == 2 && assoc->server && assoc->server->docpath + && hreq->path[0] == '/' + && + /* check if path is a proper prefix of documentroot */ + strncmp(hreq->path+1, assoc->server->docpath, + strlen(assoc->server->docpath)) + == 0) { - p = z_get_HTTP_Response(o, 200); - hres = p->u.HTTP_Response; - hres->content_buf = "1234567890\n"; - hres->content_len = strlen(hres->content_buf); + if (!check_path(hreq->path)) + { + yaz_log(YLOG_LOG, "File %s access forbidden", hreq->path+1); + p = z_get_HTTP_Response(o, 404); + } + else + { + size_t content_size = 0; + char *content_buf = read_file(hreq->path+1, o, &content_size); + if (!content_buf) + { + yaz_log(YLOG_LOG, "File %s not found", hreq->path+1); + p = z_get_HTTP_Response(o, 404); + } + else + { + const char *ctype = 0; + yaz_mime_types types = yaz_mime_types_create(); + + yaz_mime_types_add(types, "xsl", "application/xml"); + yaz_mime_types_add(types, "xml", "application/xml"); + yaz_mime_types_add(types, "css", "text/css"); + yaz_mime_types_add(types, "html", "text/html"); + yaz_mime_types_add(types, "htm", "text/html"); + yaz_mime_types_add(types, "txt", "text/plain"); + yaz_mime_types_add(types, "js", "application/x-javascript"); + + yaz_mime_types_add(types, "gif", "image/gif"); + yaz_mime_types_add(types, "png", "image/png"); + yaz_mime_types_add(types, "jpg", "image/jpeg"); + yaz_mime_types_add(types, "jpeg", "image/jpeg"); + + ctype = yaz_mime_lookup_fname(types, hreq->path); + if (!ctype) + { + yaz_log(YLOG_LOG, "No mime type for %s", hreq->path+1); + p = z_get_HTTP_Response(o, 404); + } + else + { + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + hres->content_buf = content_buf; + hres->content_len = content_size; + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + } + yaz_mime_types_destroy(types); + } + } r = 1; } + if (r == 2) { r = yaz_srw_decode(hreq, &sr, &soap_package, assoc->decode, &charset); @@ -1072,8 +1772,8 @@ static void process_http_request(association *assoc, request *req) if (sr->which == Z_SRW_searchRetrieve_request) { Z_SRW_PDU *res = - yaz_srw_get(assoc->encode, Z_SRW_searchRetrieve_response); - + yaz_srw_get_pdu(assoc->encode, Z_SRW_searchRetrieve_response, + sr->srw_version); stylesheet = sr->u.request->stylesheet; if (num_diagnostic) { @@ -1082,7 +1782,7 @@ static void process_http_request(association *assoc, request *req) } else { - srw_bend_search(assoc, req, sr->u.request, res->u.response, + srw_bend_search(assoc, req, sr, res->u.response, &http_code); } if (http_code == 200) @@ -1090,62 +1790,87 @@ static void process_http_request(association *assoc, request *req) } else if (sr->which == Z_SRW_explain_request) { - Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_explain_response); + Z_SRW_PDU *res = yaz_srw_get_pdu(o, Z_SRW_explain_response, + sr->srw_version); stylesheet = sr->u.explain_request->stylesheet; if (num_diagnostic) { res->u.explain_response->diagnostics = diagnostic; res->u.explain_response->num_diagnostics = num_diagnostic; } - srw_bend_explain(assoc, req, sr->u.explain_request, + srw_bend_explain(assoc, req, sr, res->u.explain_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } else if (sr->which == Z_SRW_scan_request) { - Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_scan_response); + Z_SRW_PDU *res = yaz_srw_get_pdu(o, Z_SRW_scan_response, + sr->srw_version); stylesheet = sr->u.scan_request->stylesheet; if (num_diagnostic) { res->u.scan_response->diagnostics = diagnostic; res->u.scan_response->num_diagnostics = num_diagnostic; } - srw_bend_scan(assoc, req, sr->u.scan_request, - res->u.scan_response, &http_code); + srw_bend_scan(assoc, req, sr, + res->u.scan_response, &http_code); + if (http_code == 200) + soap_package->u.generic->p = res; + } + else if (sr->which == Z_SRW_update_request) + { + Z_SRW_PDU *res = yaz_srw_get_pdu(o, Z_SRW_update_response, + sr->srw_version); + yaz_log(YLOG_DEBUG, "handling SRW UpdateRequest"); + if (num_diagnostic) + { + res->u.update_response->diagnostics = diagnostic; + res->u.update_response->num_diagnostics = num_diagnostic; + } + yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics ); + srw_bend_update(assoc, req, sr, + res->u.update_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } else { yaz_log(log_request, "SOAP ERROR"); - /* FIXME - what error, what query */ + /* FIXME - what error, what query */ http_code = 500; z_soap_error(assoc->encode, soap_package, "SOAP-ENV:Client", "Bad method", 0); } if (http_code == 200 || http_code == 500) { - static Z_SOAP_Handler soap_handlers[3] = { -#if HAVE_XML2 - {"http://www.loc.gov/zing/srw/", 0, - (Z_SOAP_fun) yaz_srw_codec}, - {"http://www.loc.gov/zing/srw/v1.0/", 0, - (Z_SOAP_fun) yaz_srw_codec}, + static Z_SOAP_Handler soap_handlers[4] = { +#if YAZ_HAVE_XML2 + {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_SRU_v1_0, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec}, #endif {0, 0, 0} }; - char ctype[60]; + char ctype[80]; int ret; p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; + + if (!stylesheet && assoc->server) + stylesheet = assoc->server->stylesheet; + + /* empty stylesheet means NO stylesheet */ + if (stylesheet && *stylesheet == '\0') + stylesheet = 0; + ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package, &hres->content_buf, &hres->content_len, soap_handlers, charset, stylesheet); hres->code = http_code; strcpy(ctype, "text/xml"); - if (charset) + if (charset && strlen(charset) < sizeof(ctype)-30) { strcat(ctype, "; charset="); strcat(ctype, charset); @@ -1236,8 +1961,6 @@ static int process_z_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; @@ -1285,7 +2008,7 @@ static int process_z_request(association *assoc, request *req, char **msg) case Z_APDU_segmentRequest: if (assoc->init->bend_segment) { - res = process_segmentRequest (assoc, req); + res = process_segmentRequest(assoc, req); } else { @@ -1317,7 +2040,7 @@ static int process_z_request(association *assoc, request *req, char **msg) yaz_log(YLOG_DEBUG, " establishing handler for result"); req->state = REQUEST_PENDING; - if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT))) + if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT, 0))) abort(); iochan_setdata(chan, assoc); retval = 0; @@ -1397,13 +2120,17 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) 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)) + for (;;) { - yaz_log (YLOG_DEBUG, "more work to be done"); - iochan_setevent(assoc->client_chan, EVENT_WORK); + req = request_head(&assoc->incoming); + if (req && req->state == REQUEST_IDLE) + { + request_deq(&assoc->incoming); + process_gdu_request(assoc, req); + } + else + break; } -#endif return 0; } @@ -1419,6 +2146,10 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res) return process_gdu_response(assoc, req, gres); } +static char *get_vhost(Z_OtherInformation *otherInfo) +{ + return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0); +} /* * Handle init request. @@ -1429,22 +2160,30 @@ static int process_z_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->apdu_request->u.initRequest; Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse); Z_InitResponse *resp = apdu->u.initResponse; bend_initresult *binitres; - char *version; char options[140]; + statserv_options_block *cb = 0; /* by default no control for backend */ + + if (control_association(assoc, get_vhost(req->otherInfo), 1)) + cb = statserv_getcontrol(); /* got control block for backend */ + + if (cb && assoc->backend) + (*cb->bend_close)(assoc->backend); yaz_log(log_requestdetail, "Got initRequest"); if (req->implementationId) - yaz_log(log_requestdetail, "Id: %s", req->implementationId); + yaz_log(log_requestdetail, "Id: %s", + req->implementationId); if (req->implementationName) - yaz_log(log_requestdetail, "Name: %s", req->implementationName); + yaz_log(log_requestdetail, "Name: %s", + req->implementationName); if (req->implementationVersion) - yaz_log(log_requestdetail, "Version: %s", req->implementationVersion); - + yaz_log(log_requestdetail, "Version: %s", + req->implementationVersion); + assoc_init_reset(assoc); assoc->init->auth = req->idAuthentication; @@ -1458,29 +2197,47 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) negotiation->which == Z_CharSetandLanguageNegotiation_proposal) assoc->init->charneg_request = negotiation; } - + assoc->backend = 0; - if (!(binitres = (*cb->bend_init)(assoc->init))) + if (cb) { - yaz_log(YLOG_WARN, "Bad response from backend."); - return 0; + if (req->implementationVersion) + yaz_log(log_requestdetail, "Config: %s", + cb->configname); + + iochan_settimeout(assoc->client_chan, cb->idle_timeout * 60); + + /* we have a backend control block, so call that init function */ + if (!(binitres = (*cb->bend_init)(assoc->init))) + { + yaz_log(YLOG_WARN, "Bad response from backend."); + return 0; + } + assoc->backend = binitres->handle; + } + else + { + /* no backend. return error */ + binitres = (bend_initresult *) + odr_malloc(assoc->encode, sizeof(*binitres)); + binitres->errstring = 0; + binitres->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR; + iochan_settimeout(assoc->client_chan, 10); } - - assoc->backend = binitres->handle; if ((assoc->init->bend_sort)) - yaz_log (YLOG_DEBUG, "Sort handler installed"); + yaz_log(YLOG_DEBUG, "Sort handler installed"); if ((assoc->init->bend_search)) - yaz_log (YLOG_DEBUG, "Search handler installed"); + yaz_log(YLOG_DEBUG, "Search handler installed"); if ((assoc->init->bend_present)) - yaz_log (YLOG_DEBUG, "Present handler installed"); + yaz_log(YLOG_DEBUG, "Present handler installed"); if ((assoc->init->bend_esrequest)) - yaz_log (YLOG_DEBUG, "ESRequest handler installed"); + yaz_log(YLOG_DEBUG, "ESRequest handler installed"); if ((assoc->init->bend_delete)) - yaz_log (YLOG_DEBUG, "Delete handler installed"); + yaz_log(YLOG_DEBUG, "Delete handler installed"); if ((assoc->init->bend_scan)) - yaz_log (YLOG_DEBUG, "Scan handler installed"); + yaz_log(YLOG_DEBUG, "Scan handler installed"); if ((assoc->init->bend_segment)) - yaz_log (YLOG_DEBUG, "Segment handler installed"); + yaz_log(YLOG_DEBUG, "Segment handler installed"); resp->referenceId = req->referenceId; *options = '\0'; @@ -1505,7 +2262,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->bend_esrequest) { ODR_MASK_SET(resp->options, Z_Options_extendedServices); - strcat (options, " extendedServices"); + strcat(options, " extendedServices"); } if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) { @@ -1527,27 +2284,36 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) ODR_MASK_SET(resp->options, Z_Options_sort); strcat(options, " sort"); } - - if (ODR_MASK_GET(req->options, Z_Options_negotiationModel) - && assoc->init->charneg_response) + + if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)) { - 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); - + + if (!assoc->init->charneg_response) + { + if (assoc->init->query_charset) + { + assoc->init->charneg_response = yaz_set_response_charneg( + assoc->encode, assoc->init->query_charset, 0, + assoc->init->records_in_same_charset); + } + else + { + yaz_log(YLOG_WARN, "default query_charset not defined by backend"); + } + } + if (assoc->init->charneg_response + && (p0=yaz_oi_update(&resp->otherInfo, assoc->encode, NULL, 0, 0))) + { p0->which = Z_OtherInfo_externallyDefinedInfo; p0->information.externallyDefinedInfo = assoc->init->charneg_response; + ODR_MASK_SET(resp->options, Z_Options_negotiationModel); + strcat(options, " negotiation"); } - ODR_MASK_SET(resp->options, Z_Options_negotiationModel); - strcat(options, " negotiation"); } - - ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl); + if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl)) + ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl); if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) { @@ -1566,12 +2332,12 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options); - assoc->maximumRecordSize = *req->maximumRecordSize; - if (assoc->maximumRecordSize > control_block->maxrecordsize) - assoc->maximumRecordSize = control_block->maxrecordsize; - assoc->preferredMessageSize = *req->preferredMessageSize; - if (assoc->preferredMessageSize > assoc->maximumRecordSize) - assoc->preferredMessageSize = assoc->maximumRecordSize; + + if (*req->maximumRecordSize < assoc->maximumRecordSize) + assoc->maximumRecordSize = *req->maximumRecordSize; + + if (*req->preferredMessageSize < assoc->preferredMessageSize) + assoc->preferredMessageSize = *req->preferredMessageSize; resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize; @@ -1584,39 +2350,63 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); - version = odr_strdup(assoc->encode, "$Revision: 1.46 $"); - if (strlen(version) > 10) /* check for unexpanded CVS strings */ - version[strlen(version)-2] = '\0'; - resp->implementationVersion = odr_prepend(assoc->encode, - assoc->init->implementation_version, - odr_prepend(assoc->encode, &version[11], - resp->implementationVersion)); - if (binitres->errcode) { assoc->state = ASSOC_DEAD; resp->userInformationField = - init_diagnostics(assoc->encode, binitres->errcode, - binitres->errstring); + init_diagnostics(assoc->encode, binitres->errcode, + binitres->errstring); *resp->result = 0; } if (log_request) { - WRBUF wr = wrbuf_alloc(); - wrbuf_printf(wr, "Init "); - if (binitres->errcode) - wrbuf_printf(wr, "ERROR %d", binitres->errcode); - else - wrbuf_printf(wr, "OK -"); - wrbuf_printf(wr, " ID:%s Name:%s Version:%s", - (req->implementationId ? req->implementationId :"-"), - (req->implementationName ? - req->implementationName : "-"), - (req->implementationVersion ? - req->implementationVersion : "-") - ); - yaz_log(log_request, "%s", wrbuf_buf(wr)); - wrbuf_free(wr, 1); + if (!req->idAuthentication) + yaz_log(log_request, "Auth none"); + else if (req->idAuthentication->which == Z_IdAuthentication_open) + { + const char *open = req->idAuthentication->u.open; + const char *slash = strchr(open, '/'); + int len; + if (slash) + len = slash - open; + else + len = strlen(open); + yaz_log(log_request, "Auth open %.*s", len, open); + } + else if (req->idAuthentication->which == Z_IdAuthentication_idPass) + { + const char *user = req->idAuthentication->u.idPass->userId; + const char *group = req->idAuthentication->u.idPass->groupId; + yaz_log(log_request, "Auth idPass %s %s", + user ? user : "-", group ? group : "-"); + } + else if (req->idAuthentication->which + == Z_IdAuthentication_anonymous) + { + yaz_log(log_request, "Auth anonymous"); + } + else + { + yaz_log(log_request, "Auth other"); + } + } + if (log_request) + { + WRBUF wr = wrbuf_alloc(); + wrbuf_printf(wr, "Init "); + if (binitres->errcode) + wrbuf_printf(wr, "ERROR %d", binitres->errcode); + else + wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, " ID:%s Name:%s Version:%s", + (req->implementationId ? req->implementationId :"-"), + (req->implementationName ? + req->implementationName : "-"), + (req->implementationVersion ? + req->implementationVersion : "-") + ); + yaz_log(log_request, "%s", wrbuf_cstr(wr)); + wrbuf_destroy(wr); } return apdu; } @@ -1639,14 +2429,14 @@ static Z_External *init_diagnostics(ODR odr, int error, const char *addinfo) */ static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec)); + Z_Records *rec = (Z_Records *) odr_malloc(assoc->encode, sizeof(*rec)); yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), - addinfo ? " -- " : "", addinfo ? addinfo : ""); + addinfo ? " -- " : "", addinfo ? addinfo : ""); rec->which = Z_Records_NSD; rec->u.nonSurrogateDiagnostic = zget_DefaultDiagFormat(assoc->encode, - error, addinfo); + error, addinfo); return rec; } @@ -1654,27 +2444,27 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) * surrogate diagnostic. */ static Z_NamePlusRecord *surrogatediagrec(association *assoc, - const char *dbname, + const char *dbname, int error, const char *addinfo) { yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), - addinfo ? " -- " : "", addinfo ? addinfo : ""); + addinfo ? " -- " : "", addinfo ? addinfo : ""); return zget_surrogateDiagRec(assoc->encode, dbname, error, addinfo); } static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, - int *next, int *pres, oid_value format, + int *next, int *pres, Z_ReferenceId *referenceId, - int *oid, int *errcode) + Odr_oid *oid, int *errcode) { int recno, total_length = 0, toget = *num, dumped_records = 0; Z_Records *records = - (Z_Records *) odr_malloc (a->encode, sizeof(*records)); + (Z_Records *) odr_malloc(a->encode, sizeof(*records)); Z_NamePlusRecordList *reclist = - (Z_NamePlusRecordList *) odr_malloc (a->encode, sizeof(*reclist)); + (Z_NamePlusRecordList *) odr_malloc(a->encode, sizeof(*reclist)); Z_NamePlusRecord **list = - (Z_NamePlusRecord **) odr_malloc (a->encode, sizeof(*list) * toget); + (Z_NamePlusRecord **) odr_malloc(a->encode, sizeof(*list) * toget); records->which = Z_Records_DBOSD; records->u.databaseOrSurDiagnostics = reclist; @@ -1708,26 +2498,27 @@ static Z_Records *pack_records(association *a, char *setname, int start, freq.surrogate_flag = 0; freq.number = recno; freq.comp = comp; - freq.request_format = format; - freq.request_format_raw = oid; - freq.output_format = format; - freq.output_format_raw = 0; + freq.request_format = oid; + freq.output_format = 0; freq.stream = a->encode; freq.print = a->print; freq.referenceId = referenceId; freq.schema = 0; - (*a->init->bend_fetch)(a->backend, &freq); - /* backend should be able to signal whether error is system-wide - or only pertaining to current record */ + + retrieve_fetch(a, &freq); + + *next = freq.last_in_set ? 0 : recno + 1; + if (freq.errcode) { - if (!freq.surrogate_flag) + if (!freq.surrogate_flag) /* non-surrogate diagnostic i.e. global */ { char s[20]; *pres = Z_PresentStatus_failure; /* for 'present request out of range', set addinfo to record position if not set */ - if (freq.errcode == 13 && freq.errstring == 0) + if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE && + freq.errstring == 0) { sprintf (s, "%d", recno); freq.errstring = s; @@ -1740,9 +2531,13 @@ static Z_Records *pack_records(association *a, char *setname, int start, surrogatediagrec(a, freq.basename, freq.errcode, freq.errstring); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; continue; } + if (freq.record == 0) /* no error and no record ? */ + { + *next = 0; /* signal end-of-set and stop */ + break; + } if (freq.len >= 0) this_length = freq.len; else @@ -1769,7 +2564,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, 16, 0); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; dumped_records += this_length; continue; } @@ -1781,7 +2575,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, 17, 0); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; dumped_records += this_length; continue; } @@ -1790,24 +2583,17 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisrec = (Z_NamePlusRecord *) odr_malloc(a->encode, sizeof(*thisrec)))) return 0; - if (!(thisrec->databaseName = (char *)odr_malloc(a->encode, - strlen(freq.basename) + 1))) - return 0; - strcpy(thisrec->databaseName, freq.basename); + thisrec->databaseName = odr_strdup_null(a->encode, freq.basename); thisrec->which = Z_NamePlusRecord_databaseRecord; - 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 (!freq.output_format) + freq.output_format = freq.request_format; + thisrec->u.databaseRecord = z_ext_record_oid( + a->encode, freq.output_format, freq.record, freq.len); if (!thisrec->u.databaseRecord) return 0; reclist->records[reclist->num_records] = thisrec; reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; } *num = reclist->num_records; return records; @@ -1818,7 +2604,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, { Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; bend_search_rr *bsrr = - (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); + (bend_search_rr *)nmem_malloc(reqb->request_mem, sizeof(*bsrr)); yaz_log(log_requestdetail, "Got SearchRequest."); bsrr->fd = fd; @@ -1826,13 +2612,18 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrr->association = assoc; bsrr->referenceId = req->referenceId; save_referenceId (reqb, bsrr->referenceId); + bsrr->srw_sortKeys = 0; + bsrr->srw_setname = 0; + bsrr->srw_setnameIdleTime = 0; + bsrr->estimated_hit_count = 0; + bsrr->partial_resultset = 0; yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) { int i; for (i = 0; i < req->num_databaseNames; i++) - yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]); + yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]); } yaz_log_zquery_level(log_requestdetail,req->query); @@ -1845,14 +2636,39 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrr->basenames = req->databaseNames; bsrr->query = req->query; bsrr->stream = assoc->encode; - nmem_transfer(bsrr->stream->mem, reqb->request_mem); + nmem_transfer(odr_getmem(bsrr->stream), reqb->request_mem); bsrr->decode = assoc->decode; bsrr->print = assoc->print; - bsrr->errcode = 0; bsrr->hits = 0; + bsrr->errcode = 0; bsrr->errstring = NULL; bsrr->search_info = NULL; - (assoc->init->bend_search)(assoc->backend, bsrr); + + if (assoc->server && assoc->server->cql_transform + && req->query->which == Z_Query_type_104 + && req->query->u.type_104->which == Z_External_CQL) + { + /* have a CQL query and a CQL to PQF transform .. */ + int srw_errcode = + cql2pqf(bsrr->stream, req->query->u.type_104->u.cql, + assoc->server->cql_transform, bsrr->query); + if (srw_errcode) + bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); + } + + if (assoc->server && assoc->server->ccl_transform + && req->query->which == Z_Query_type_2) /*CCL*/ + { + /* have a CCL query and a CCL to PQF transform .. */ + int srw_errcode = + ccl2pqf(bsrr->stream, req->query->u.type_2, + assoc->server->ccl_transform, bsrr); + if (srw_errcode) + bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); + } + + if (!bsrr->errcode) + (assoc->init->bend_search)(assoc->backend, bsrr); if (!bsrr->request) /* backend not ready with the search response */ return 0; /* should not be used any more */ } @@ -1877,14 +2693,13 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, bend_search_rr *bsrt, int *fd) { Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); Z_SearchResponse *resp = (Z_SearchResponse *) - odr_malloc (assoc->encode, sizeof(*resp)); - int *nulint = odr_intdup (assoc->encode, 0); - bool_t *sr = odr_intdup(assoc->encode, 1); + odr_malloc(assoc->encode, sizeof(*resp)); + int *nulint = odr_intdup(assoc->encode, 0); int *next = odr_intdup(assoc->encode, 0); int *none = odr_intdup(assoc->encode, Z_SearchResponse_none); - int returnedrecs=0; + int returnedrecs = 0; apdu->which = Z_APDU_searchResponse; apdu->u.searchResponse = resp; @@ -1909,11 +2724,11 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else { + bool_t *sr = odr_intdup(assoc->encode, 1); int *toget = odr_intdup(assoc->encode, 0); - int *presst = odr_intdup(assoc->encode, 0); Z_RecordComposition comp, *compp = 0; - yaz_log (log_requestdetail, "resultCount: %d", bsrt->hits); + yaz_log(log_requestdetail, "resultCount: %d", bsrt->hits); resp->records = 0; resp->resultCount = &bsrt->hits; @@ -1939,23 +2754,44 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (*toget && !resp->records) { - oident *prefformat; - oid_value form; + int *presst = odr_intdup(assoc->encode, 0); + /* Call bend_present if defined */ + if (assoc->init->bend_present) + { + bend_present_rr *bprr = (bend_present_rr *) + nmem_malloc(reqb->request_mem, sizeof(*bprr)); + bprr->setname = req->resultSetName; + bprr->start = 1; + bprr->number = *toget; + bprr->format = req->preferredRecordSyntax; + bprr->comp = compp; + bprr->referenceId = req->referenceId; + bprr->stream = assoc->encode; + bprr->print = assoc->print; + bprr->request = reqb; + bprr->association = assoc; + bprr->errcode = 0; + bprr->errstring = NULL; + (*assoc->init->bend_present)(assoc->backend, bprr); + + if (!bprr->request) + return 0; + if (bprr->errcode) + { + resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); + *resp->presentStatus = Z_PresentStatus_failure; + } + } - if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax))) - form = VAL_NONE; - else - form = prefformat->value; - resp->records = pack_records(assoc, req->resultSetName, 1, - toget, compp, next, presst, form, req->referenceId, - req->preferredRecordSyntax, NULL); + if (!resp->records) + resp->records = pack_records( + assoc, req->resultSetName, 1, + toget, compp, next, presst, req->referenceId, + req->preferredRecordSyntax, NULL); if (!resp->records) return 0; resp->numberOfRecordsReturned = toget; returnedrecs = *toget; - resp->nextResultSetPosition = next; - resp->searchStatus = sr; - resp->resultSetStatus = 0; resp->presentStatus = presst; } else @@ -1963,27 +2799,46 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (*resp->resultCount) *next = 1; resp->numberOfRecordsReturned = nulint; - resp->nextResultSetPosition = next; - resp->searchStatus = sr; - resp->resultSetStatus = 0; resp->presentStatus = 0; } + resp->nextResultSetPosition = next; + resp->searchStatus = sr; + resp->resultSetStatus = 0; + if (bsrt->estimated_hit_count) + { + resp->resultSetStatus = odr_intdup(assoc->encode, + Z_SearchResponse_estimate); + } + else if (bsrt->partial_resultset) + { + resp->resultSetStatus = odr_intdup(assoc->encode, + Z_SearchResponse_subset); + } } resp->additionalSearchInfo = bsrt->search_info; if (log_request) { + int i; WRBUF wr = wrbuf_alloc(); + + for (i = 0 ; i < req->num_databaseNames; i++){ + if (i) + wrbuf_printf(wr, "+"); + wrbuf_puts(wr, req->databaseNames[i]); + } + wrbuf_printf(wr, " "); + if (bsrt->errcode) - wrbuf_printf(wr, "ERROR %d", bsrt->errcode); - else - wrbuf_printf(wr, "OK %d", bsrt->hits); - wrbuf_printf(wr, " %s 1+%d ", - req->resultSetName, returnedrecs); - wrbuf_put_zquery(wr, req->query); - - yaz_log(log_request, "Search %s", wrbuf_buf(wr)); - wrbuf_free(wr, 1); + wrbuf_printf(wr, "ERROR %d", bsrt->errcode); + else + wrbuf_printf(wr, "OK %d", bsrt->hits); + wrbuf_printf(wr, " %s 1+%d ", + req->resultSetName, returnedrecs); + yaz_query_to_wrbuf(wr, req->query); + + yaz_log(log_request, "Search %s", wrbuf_cstr(wr)); + wrbuf_destroy(wr); } return apdu; } @@ -2007,8 +2862,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd) { Z_PresentRequest *req = reqb->apdu_request->u.presentRequest; - oident *prefformat; - oid_value form; Z_APDU *apdu; Z_PresentResponse *resp; int *next; @@ -2018,21 +2871,17 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, yaz_log(log_requestdetail, "Got PresentRequest."); - if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax))) - form = VAL_NONE; - else - form = prefformat->value; - resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + resp = (Z_PresentResponse *)odr_malloc(assoc->encode, sizeof(*resp)); resp->records = 0; resp->presentStatus = odr_intdup(assoc->encode, 0); if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr *) - nmem_malloc (reqb->request_mem, sizeof(*bprr)); + nmem_malloc(reqb->request_mem, sizeof(*bprr)); bprr->setname = req->resultSetId; bprr->start = *req->resultSetStartPoint; bprr->number = *req->numberOfRecordsRequested; - bprr->format = form; + bprr->format = req->preferredRecordSyntax; bprr->comp = req->recordComposition; bprr->referenceId = req->referenceId; bprr->stream = assoc->encode; @@ -2050,10 +2899,10 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); *resp->presentStatus = Z_PresentStatus_failure; errcode = bprr->errcode; - errstring = bprr->errstring; + errstring = bprr->errstring; } } - apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); next = odr_intdup(assoc->encode, 0); num = odr_intdup(assoc->encode, 0); @@ -2067,9 +2916,9 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, *num = *req->numberOfRecordsRequested; resp->records = pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, - num, req->recordComposition, next, - resp->presentStatus, - form, req->referenceId, req->preferredRecordSyntax, + num, req->recordComposition, next, + resp->presentStatus, + req->referenceId, req->preferredRecordSyntax, &errcode); } if (log_request) @@ -2078,17 +2927,17 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, wrbuf_printf(wr, "Present "); if (*resp->presentStatus == Z_PresentStatus_failure) - wrbuf_printf(wr, "ERROR %d", errcode); + wrbuf_printf(wr, "ERROR %d ", errcode); else if (*resp->presentStatus == Z_PresentStatus_success) - wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, "OK - "); else - wrbuf_printf(wr, "Partial %d", *resp->presentStatus); + wrbuf_printf(wr, "Partial %d - ", *resp->presentStatus); wrbuf_printf(wr, " %s %d+%d ", req->resultSetId, *req->resultSetStartPoint, *req->numberOfRecordsRequested); - yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + yaz_log(log_request, "%s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } if (!resp->records) return 0; @@ -2105,17 +2954,16 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { Z_ScanRequest *req = reqb->apdu_request->u.scanRequest; - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); Z_ScanResponse *res = (Z_ScanResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); int *scanStatus = odr_intdup(assoc->encode, Z_Scan_failure); int *numberOfEntriesReturned = odr_intdup(assoc->encode, 0); Z_ListEntries *ents = (Z_ListEntries *) - odr_malloc (assoc->encode, sizeof(*ents)); + odr_malloc(assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; - oident *attset; bend_scan_rr *bsrr = (bend_scan_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); + odr_malloc(assoc->encode, sizeof(*bsrr)); struct scan_entry *save_entries; yaz_log(log_requestdetail, "Got ScanRequest"); @@ -2144,11 +2992,11 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { int i; for (i = 0; i < req->num_databaseNames; i++) - yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]); + yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]); } - yaz_log(log_requestdetail, "pos %d step %d entries %d", - *req->preferredPositionInResponse, *res->stepSize, - *req->numberOfTermsRequested); + bsrr->scanClause = 0; + bsrr->errcode = 0; + bsrr->errstring = 0; bsrr->num_bases = req->num_databaseNames; bsrr->basenames = req->databaseNames; bsrr->num_entries = *req->numberOfTermsRequested; @@ -2157,6 +3005,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) bsrr->stream = assoc->encode; bsrr->print = assoc->print; bsrr->step_size = res->stepSize; + bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, + yaz_oid_userinfo_scan_set, 1, 0); bsrr->entries = 0; /* For YAZ 2.0 and earlier it was the backend handler that initialized entries (member display_term did not exist) @@ -2168,8 +3018,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) if (bsrr->num_entries > 0) { int i; - bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) * - bsrr->num_entries); + bsrr->entries = (struct scan_entry *) + odr_malloc(assoc->decode, sizeof(*bsrr->entries) * + bsrr->num_entries); for (i = 0; inum_entries; i++) { bsrr->entries[i].term = 0; @@ -2181,14 +3032,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) } save_entries = bsrr->entries; /* save it so we can compare later */ - 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_level (log_requestdetail, req->termListAndStartPoint, - bsrr->attributeset); + bsrr->attributeset = req->attributeSet; + log_scan_term_level(log_requestdetail, req->termListAndStartPoint, + bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; @@ -2197,12 +3043,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) if (bsrr->errcode) diagrecs_p = zget_DiagRecs(assoc->encode, - bsrr->errcode, bsrr->errstring); + bsrr->errcode, bsrr->errstring); else { int i; Z_Entry **tab = (Z_Entry **) - odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries); + odr_malloc(assoc->encode, sizeof(*tab) * bsrr->num_entries); if (bsrr->status == BEND_SCAN_PARTIAL) *scanStatus = Z_Scan_partial_5; @@ -2255,11 +3101,11 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) else { Z_DiagRecs *drecs = zget_DiagRecs(assoc->encode, - bsrr->entries[i].errcode, - bsrr->entries[i].errstring); - assert (drecs->num_diagRecs == 1); + bsrr->entries[i].errcode, + bsrr->entries[i].errstring); + assert(drecs->num_diagRecs == 1); e->which = Z_Entry_surrogateDiagnostic; - assert (drecs->diagRecs[0]); + assert(drecs->diagRecs[0]); e->u.surrogateDiagnostic = drecs->diagRecs[0]; } } @@ -2271,23 +3117,39 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) } if (log_request) { + int i; WRBUF wr = wrbuf_alloc(); + wrbuf_printf(wr, "Scan "); + for (i = 0 ; i < req->num_databaseNames; i++) + { + if (i) + wrbuf_printf(wr, "+"); + wrbuf_puts(wr, req->databaseNames[i]); + } + + wrbuf_printf(wr, " "); + if (bsrr->errcode) - wr_diag(wr, bsrr->errcode, bsrr->errstring); - else if (*res->scanStatus == Z_Scan_success) - wrbuf_printf(wr, "OK"); - else - wrbuf_printf(wr, "Partial"); - - wrbuf_printf(wr, " %d+%d %d ", - *req->preferredPositionInResponse, - *req->numberOfTermsRequested, - (res->stepSize ? *res->stepSize : 0)); - wrbuf_scan_term(wr, req->termListAndStartPoint, - bsrr->attributeset); - - yaz_log(log_request, "Scan %s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + wr_diag(wr, bsrr->errcode, bsrr->errstring); + else + wrbuf_printf(wr, "OK"); + + wrbuf_printf(wr, " %d - %d+%d+%d", + res->numberOfEntriesReturned ? + *res->numberOfEntriesReturned : 0, + (req->preferredPositionInResponse ? + *req->preferredPositionInResponse : 1), + *req->numberOfTermsRequested, + (res->stepSize ? *res->stepSize : 1)); + + if (bsrr->setname) + wrbuf_printf(wr, "+%s", bsrr->setname); + + wrbuf_printf(wr, " "); + yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, + bsrr->attributeset); + yaz_log(log_request, "%s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } return apdu; } @@ -2298,11 +3160,11 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, int i; Z_SortRequest *req = reqb->apdu_request->u.sortRequest; Z_SortResponse *res = (Z_SortResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); bend_sort_rr *bsrr = (bend_sort_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); + odr_malloc(assoc->encode, sizeof(*bsrr)); - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); yaz_log(log_requestdetail, "Got SortRequest."); @@ -2332,7 +3194,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, if (bsrr->errcode) { Z_DiagRecs *dr = zget_DiagRecs(assoc->encode, - bsrr->errcode, bsrr->errstring); + bsrr->errcode, bsrr->errstring); res->diagnostics = dr->diagRecs; res->num_diagnostics = dr->num_diagRecs; } @@ -2350,21 +3212,21 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, { WRBUF wr = wrbuf_alloc(); wrbuf_printf(wr, "Sort "); - if (bsrr->errcode) - wrbuf_printf(wr, " ERROR %d", bsrr->errcode); - else - wrbuf_printf(wr, "OK -"); - wrbuf_printf(wr, " ("); + if (bsrr->errcode) + wrbuf_printf(wr, " ERROR %d", bsrr->errcode); + else + wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, " ("); for (i = 0; inum_inputResultSetNames; i++) { if (i) - wrbuf_printf(wr, ","); - wrbuf_printf(wr, req->inputResultSetNames[i]); + wrbuf_printf(wr, "+"); + wrbuf_puts(wr, req->inputResultSetNames[i]); } wrbuf_printf(wr, ")->%s ",req->sortedResultSetName); - yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + yaz_log(log_request, "%s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } return apdu; } @@ -2376,10 +3238,10 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, Z_DeleteResultSetRequest *req = reqb->apdu_request->u.deleteResultSetRequest; Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); bend_delete_rr *bdrr = (bend_delete_rr *) - odr_malloc (assoc->encode, sizeof(*bdrr)); - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + odr_malloc(assoc->encode, sizeof(*bdrr)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); yaz_log(log_requestdetail, "Got DeleteRequest."); @@ -2416,18 +3278,18 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, res->deleteListStatuses->num = bdrr->num_setnames; res->deleteListStatuses->elements = (Z_ListStatus **) - odr_malloc (assoc->encode, + odr_malloc(assoc->encode, sizeof(*res->deleteListStatuses->elements) * bdrr->num_setnames); for (i = 0; inum_setnames; i++) { res->deleteListStatuses->elements[i] = (Z_ListStatus *) - odr_malloc (assoc->encode, + 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]); + odr_strdup(assoc->encode, bdrr->setnames[i]); } } res->numberNotDeleted = 0; @@ -2447,8 +3309,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, wrbuf_printf(wr, "OK -"); for (i = 0; inum_resultSetList; i++) wrbuf_printf(wr, " %s ", req->resultSetList[i]); - yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + yaz_log(log_request, "%s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } return apdu; } @@ -2480,13 +3342,13 @@ static void process_close(association *assoc, request *reqb) yaz_log(log_request,"Close OK"); } -void save_referenceId (request *reqb, Z_ReferenceId *refid) +void save_referenceId(request *reqb, Z_ReferenceId *refid) { if (refid) { reqb->len_refid = refid->len; - reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len); - memcpy (reqb->refid, refid->buf, refid->len); + reqb->refid = (char *)nmem_malloc(reqb->request_mem, refid->len); + memcpy(reqb->refid, refid->buf, refid->len); } else { @@ -2495,44 +3357,44 @@ void save_referenceId (request *reqb, Z_ReferenceId *refid) } } -void bend_request_send (bend_association a, bend_request req, Z_APDU *res) +void bend_request_send(bend_association a, bend_request req, Z_APDU *res) { - process_z_response (a, req, res); + process_z_response(a, req, res); } -bend_request bend_request_mk (bend_association a) +bend_request bend_request_mk(bend_association a) { - request *nreq = request_get (&a->outgoing); - nreq->request_mem = nmem_create (); + request *nreq = request_get(&a->outgoing); + nreq->request_mem = nmem_create(); return nreq; } -Z_ReferenceId *bend_request_getid (ODR odr, bend_request req) +Z_ReferenceId *bend_request_getid(ODR odr, bend_request req) { Z_ReferenceId *id; if (!req->refid) return 0; - id = (Odr_oct *)odr_malloc (odr, sizeof(*odr)); - id->buf = (unsigned char *)odr_malloc (odr, req->len_refid); + id = (Odr_oct *)odr_malloc(odr, sizeof(*odr)); + id->buf = (unsigned char *)odr_malloc(odr, req->len_refid); id->len = id->size = req->len_refid; - memcpy (id->buf, req->refid, req->len_refid); + memcpy(id->buf, req->refid, req->len_refid); return id; } -void bend_request_destroy (bend_request *req) +void bend_request_destroy(bend_request *req) { nmem_destroy((*req)->request_mem); request_release(*req); *req = NULL; } -int bend_backend_respond (bend_association a, bend_request req) +int bend_backend_respond(bend_association a, bend_request req) { char *msg; int r; - r = process_z_request (a, req, &msg); + r = process_z_request(a, req, &msg); if (r < 0) - yaz_log (YLOG_WARN, "%s", msg); + yaz_log(YLOG_WARN, "%s", msg); return r; } @@ -2546,7 +3408,7 @@ void *bend_request_getdata(bend_request r) return r->clientData; } -static Z_APDU *process_segmentRequest (association *assoc, request *reqb) +static Z_APDU *process_segmentRequest(association *assoc, request *reqb) { bend_segment_rr req; @@ -2564,6 +3426,7 @@ static Z_APDU *process_segmentRequest (association *assoc, request *reqb) static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) { bend_esrequest_rr esrequest; + const char *ext_name = "unknown"; Z_ExtendedServicesRequest *req = reqb->apdu_request->u.extendedServicesRequest; @@ -2571,8 +3434,6 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse; - yaz_log(log_requestdetail,"Got EsRequest"); - esrequest.esr = reqb->apdu_request->u.extendedServicesRequest; esrequest.stream = assoc->encode; esrequest.decode = assoc->decode; @@ -2583,7 +3444,24 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) esrequest.association = assoc; esrequest.taskPackage = 0; esrequest.referenceId = req->referenceId; + + if (esrequest.esr && esrequest.esr->taskSpecificParameters) + { + switch(esrequest.esr->taskSpecificParameters->which) + { + case Z_External_itemOrder: + ext_name = "ItemOrder"; break; + case Z_External_update: + ext_name = "Update"; break; + case Z_External_update0: + ext_name = "Update0"; break; + case Z_External_ESAdmin: + ext_name = "Admin"; break; + + } + } + (*assoc->init->bend_esrequest)(assoc->backend, &esrequest); /* If the response is being delayed, return NULL */ @@ -2595,40 +3473,59 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) if (esrequest.errcode == -1) { /* Backend service indicates request will be processed */ - yaz_log(log_request,"EsRequest OK: Accepted !"); + yaz_log(log_request, "Extended Service: %s (accepted)", ext_name); *resp->operationStatus = Z_ExtendedServicesResponse_accepted; } else if (esrequest.errcode == 0) { /* Backend service indicates request will be processed */ - yaz_log(log_request,"EsRequest OK: Done !"); + yaz_log(log_request, "Extended Service: %s (done)", ext_name); *resp->operationStatus = Z_ExtendedServicesResponse_done; } else { Z_DiagRecs *diagRecs = - zget_DiagRecs(assoc->encode, esrequest.errcode, - esrequest.errstring); + zget_DiagRecs(assoc->encode, esrequest.errcode, + esrequest.errstring); /* Backend indicates error, request will not be processed */ - yaz_log(YLOG_DEBUG,"Request could not be processed...failure !"); + yaz_log(log_request, "Extended Service: %s (failed)", ext_name); *resp->operationStatus = Z_ExtendedServicesResponse_failure; resp->num_diagnostics = diagRecs->num_diagRecs; resp->diagnostics = diagRecs->diagRecs; if (log_request) { - WRBUF wr=wrbuf_alloc(); + WRBUF wr = wrbuf_alloc(); wrbuf_diags(wr, resp->num_diagnostics, resp->diagnostics); - yaz_log(log_request, "EsRequest %s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + yaz_log(log_request, "EsRequest %s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } } /* Do something with the members of bend_extendedservice */ if (esrequest.taskPackage) - resp->taskPackage = z_ext_record (assoc->encode, VAL_EXTENDED, - (const char *) esrequest.taskPackage, - -1); + { + resp->taskPackage = z_ext_record_oid( + assoc->encode, yaz_oid_recsyn_extended, + (const char *) esrequest.taskPackage, -1); + } yaz_log(YLOG_DEBUG,"Send the result apdu"); return apdu; } +int bend_assoc_is_alive(bend_association assoc) +{ + if (assoc->state == ASSOC_DEAD) + return 0; /* already marked as dead. Don't check I/O chan anymore */ + + return iochan_is_alive(assoc->client_chan); +} + + +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +