X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=ec2883034cdba972ddea8bf600ed72ee4cf59b78;hp=e395981764cb6f3ecd2cbd9ac6e09a204057ecd0;hb=9e3111eaac05558be44beadb89eb7ba8c73eb9d5;hpb=0d3acc914a510c397cb8f65bbd957697284c41d9 diff --git a/src/seshigh.c b/src/seshigh.c index e395981..ec28830 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.62 2005-09-12 09:13:26 adam Exp $ + * $Id: seshigh.c,v 1.109 2007-01-16 14:12:38 adam Exp $ */ /** * \file seshigh.c @@ -50,7 +50,7 @@ #include #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #endif @@ -60,10 +60,12 @@ #include #include "eventl.h" #include "session.h" +#include "mime.h" #include #include #include #include +#include #include #include #include @@ -100,27 +102,36 @@ 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_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, " "); } @@ -182,8 +193,7 @@ association *create_association(IOCHAN channel, COMSTACK link, request_initq(&anew->incoming); request_initq(&anew->outgoing); anew->proto = cs_getproto(link); - anew->cql_transform = 0; - anew->server_node_ptr = 0; + anew->server = 0; return anew; } @@ -254,6 +264,98 @@ static void do_close(association *a, int reason, char *message) do_close_req (a, reason, message, req); } + +int ir_read(IOCHAN h, int event) +{ + association *assoc = (association *)iochan_getdata(h); + COMSTACK conn = assoc->client_link; + request *req; + + if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask)) + { + yaz_log(YLOG_DEBUG, "ir_session (input)"); + /* We aren't speaking to this fellow */ + if (assoc->state == ASSOC_DEAD) + { + yaz_log(log_sessiondetail, "Connection closed - end of session"); + cs_close(conn); + destroy_association(assoc); + iochan_destroy(h); + return 0; + } + assoc->cs_get_mask = EVENT_INPUT; + + do + { + int res = cs_get(conn, &assoc->input_buffer, + &assoc->input_buffer_len); + if (res < 0 && cs_errno(conn) == CSBUFSIZE) + { + 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; + } + else if (res <= 0) + { + yaz_log(log_session, "Connection closed by client"); + 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 0; + } + /* 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); + 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 %ld] ", + odr_errmsg(odr_geterror(assoc->decode)), + odr_getelement(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"); + } + else + { + Z_GDU *p = z_get_HTTP_Response(assoc->encode, 400); + assoc->state = ASSOC_DEAD; + process_gdu_response(assoc, req, p); + } + 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_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 @@ -283,7 +385,8 @@ void ir_session(IOCHAN h, int event) } else { - yaz_log(log_session, "Session idle too long. Sending close."); + yaz_log(log_sessiondetail, + "Session idle too long. Sending close."); do_close(assoc, Z_Close_lackOfActivity, 0); } return; @@ -313,82 +416,10 @@ void ir_session(IOCHAN h, int event) } return; } - if ((event & assoc->cs_get_mask) || (event & EVENT_WORK)) /* input */ + if (event & assoc->cs_get_mask) /* input */ { - if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask)) - { - yaz_log(YLOG_DEBUG, "ir_session (input)"); - /* We aren't speaking to this fellow */ - if (assoc->state == ASSOC_DEAD) - { - yaz_log(log_session, "Connection closed - end of session"); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - return; - } - assoc->cs_get_mask = EVENT_INPUT; - if ((res = cs_get(conn, &assoc->input_buffer, - &assoc->input_buffer_len)) <= 0) - { - yaz_log(log_session, "Connection closed by client"); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - return; - } - else if (res == 1) /* incomplete read - wait for more */ - { - if (conn->io_pending & CS_WANT_WRITE) - assoc->cs_get_mask |= EVENT_OUTPUT; - iochan_setflag(h, assoc->cs_get_mask); - return; - } - if (cs_more(conn)) /* more stuff - call us again later, please */ - iochan_setevent(h, EVENT_INPUT); - - /* 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); - 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] ", - odr_errmsg(odr_geterror(assoc->decode)), - odr_getelement(assoc->decode), - 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"); - } - else - { - Z_GDU *p = z_get_HTTP_Response(assoc->encode, 400); - assoc->state = ASSOC_DEAD; - process_gdu_response(assoc, req, p); - } - return; - } - req->request_mem = odr_extract_mem(assoc->decode); - if (assoc->print) - { - 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_reset(assoc->print); - } - request_enq(&assoc->incoming, req); - } - - /* can we do something yet? */ + if (!ir_read(h, event)) + return; req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) { @@ -406,7 +437,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); @@ -474,6 +505,7 @@ 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; @@ -485,7 +517,7 @@ static void assoc_init_reset(association *assoc) 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) { statserv_options_block *cb = statserv_getcontrol(); if (!assoc->init) @@ -494,11 +526,28 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) Z_External *ce; bend_initresult *binitres; - yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname); + yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname); assoc_init_reset(assoc); - assoc->maximumRecordSize = 3000000; - assoc->preferredMessageSize = 3000000; + if (sr->username) + { + Z_IdAuthentication *auth = 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 = 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; + } + #if 1 ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); assoc->init->charneg_request = ce->u.charNeg3; @@ -512,10 +561,12 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) 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, binitres->errcode, + yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code, binitres->errstring); return 0; } @@ -524,9 +575,113 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) 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; + int *match_syntax = 0; + + if (assoc->server) + { + int r; + const char *input_schema = yaz_get_esn(rr->comp); + Odr_oid *input_syntax_raw = rr->request_format_raw; + + 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_ELEMENT_SET_NAMES_UNSUPP; + 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_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, rr->stream->mem); + } + if (backend_syntax) + { + oident *oident_syntax = oid_getentbyoid(backend_syntax); + + rr->request_format_raw = backend_syntax; + + if (oident_syntax) + rr->request_format = oident_syntax->value; + else + rr->request_format = VAL_NONE; + } + } + (*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 = odr_malloc(rr->stream, rr->len); + memcpy(rr->record, wrbuf_buf(output_record), rr->len); + } + wrbuf_free(output_record, 1); + } + if (match_syntax) + { + struct oident *oi = oid_getentbyoid(match_syntax); + rr->output_format = oi ? oi->value : VAL_NONE; + rr->output_format_raw = match_syntax; + } + if (match_schema) + rr->schema = odr_strdup(rr->stream, match_schema); + return 0; +#else + (*assoc->init->bend_fetch)(assoc->backend, rr); +#endif +} + 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; @@ -536,7 +691,7 @@ static int srw_bend_fetch(association *assoc, int pos, rr.referenceId = 0; rr.request_format = VAL_TEXT_XML; rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode, - CLASS_TRANSYN, + CLASS_RECSYN, VAL_TEXT_XML); rr.comp = (Z_RecordComposition *) odr_malloc(assoc->decode, sizeof(*rr.comp)); @@ -577,8 +732,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; @@ -587,7 +740,7 @@ 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) { @@ -627,7 +780,12 @@ static int srw_bend_fetch(association *assoc, int pos, else record->recordSchema = 0; } - return rr.errcode; + if (rr.errcode) + { + *addinfo = rr.errstring; + return rr.errcode; + } + return 0; } static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, @@ -638,7 +796,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, int r; int srw_errcode = 0; const char *add = 0; - char rpn_buf[512]; + char rpn_buf[5120]; r = cql_parser_string(cp, cql); if (r) @@ -704,16 +862,17 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, } 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"); - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (srw_res->num_diagnostics == 0 && assoc->init) { bend_search_rr rr; @@ -725,15 +884,18 @@ static void srw_bend_search(association *assoc, request *req, 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->cql_transform) + if (assoc->server && assoc->server->cql_transform) { int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql, - assoc->cql_transform, rr.query); + assoc->server->cql_transform, + rr.query); if (srw_errcode) { yaz_add_srw_diagnostic(assoc->encode, @@ -771,8 +933,8 @@ static void srw_bend_search(association *assoc, request *req, 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); + yaz_log(log_requestdetail, "Parse error %d %s near offset %ld", + code, pqf_msg, (long) off); srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR; } @@ -836,44 +998,104 @@ static void srw_bend_search(association *assoc, request *req, srw_res->resultSetIdleTime = odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - if (number > 0) + + if ((rr.hits > 0 && start > rr.hits) || 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; - if (start > rr.hits) + /* Call bend_present if defined */ + if (assoc->init->bend_present) { - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + bend_present_rr *bprr = (bend_present_rr*) + odr_malloc (assoc->decode, sizeof(*bprr)); + bprr->setname = "default"; + bprr->start = start; + bprr->number = number; + bprr->format = VAL_TEXT_XML; + 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; + } } - else + + if (ok) { 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; + 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); + 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), - rr.errstring); + addinfo); break; } @@ -885,6 +1107,15 @@ static void srw_bend_search(association *assoc, request *req, 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); + } } } } @@ -906,6 +1137,8 @@ static void srw_bend_search(association *assoc, request *req, break; } wrbuf_printf(wr, "SRWSearch "); + wrbuf_printf(wr, srw_req->database); + wrbuf_printf(wr, " "); if (srw_res->num_diagnostics) wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri); else if (*http_code != 200) @@ -928,7 +1161,7 @@ static void srw_bend_search(association *assoc, request *req, static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 xmlNodePtr ptr = rr->server_node_ptr; if (!ptr) return 0; @@ -963,13 +1196,14 @@ static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) } static void srw_bend_explain(association *assoc, request *req, - Z_SRW_explainRequest *srw_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); + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (assoc->init) { bend_explain_rr rr; @@ -979,7 +1213,10 @@ static void srw_bend_explain(association *assoc, request *req, rr.print = assoc->print; rr.explain_buf = 0; rr.database = srw_req->database; - rr.server_node_ptr = assoc->server_node_ptr; + 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); @@ -989,9 +1226,13 @@ static void srw_bend_explain(association *assoc, request *req, if (rr.explain_buf) { int packing = Z_SRW_recordPacking_string; - if (srw_req->recordPacking && - !strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; + 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; @@ -1003,14 +1244,15 @@ static void srw_bend_explain(association *assoc, request *req, } static void srw_bend_scan(association *assoc, request *req, - Z_SRW_scanRequest *srw_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); + 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; @@ -1072,37 +1314,36 @@ static void srw_bend_scan(association *assoc, request *req, (*assoc->init->bend_scan))(assoc->backend, bsrr); } else if (srw_req->query_type == Z_SRW_query_type_cql - && assoc->init->bend_srw_scan) + && assoc->init->bend_scan && assoc->server + && assoc->server->cql_transform) { - if (assoc->cql_transform) - { - int srw_error; - bsrr->scanClause = 0; - bsrr->attributeset = VAL_NONE; - bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term)); - srw_error = cql2pqf_scan(assoc->encode, - srw_req->scanClause.cql, - assoc->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); - } - } + int srw_error; + bsrr->scanClause = 0; + bsrr->attributeset = VAL_NONE; + bsrr->term = 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 { - 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); + (*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, @@ -1169,25 +1410,292 @@ static void srw_bend_scan(association *assoc, request *req, querystr = srw_req->scanClause.cql; break; default: - querytype = "Unknown"; + querytype = "UNKNOWN"; querystr = ""; } - wrbuf_printf(wr, "SRWScan %d+%d", + + wrbuf_printf(wr, "SRWScan "); + wrbuf_printf(wr, srw_req->database); + wrbuf_printf(wr, " "); + + 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)); - 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) ); + /* there is no step size in SRU/W ??? */ + wrbuf_printf(wr, "%s: %s ", querytype, querystr); + yaz_log(log_request, "%s ", wrbuf_buf(wr) ); wrbuf_free(wr, 1); } } +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 ); + } + } + else + yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_INVALID_ACTION, + rr.operation ); + + 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); + } + + if (srw_req->num_recordVersions) + { + 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"); + } + + 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); + + if (pack == -1) + { + pack = Z_SRW_recordPacking_string; + yaz_log(YLOG_WARN, "Back packing %s from backend", + rr.record_packing); + } + 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, int *sz) +{ + char *buf; + FILE *inf = fopen(fname, "rb"); + if (!inf) + return 0; + + fseek(inf, 0L, SEEK_END); + *sz = ftell(inf); + rewind(inf); + buf = odr_malloc(o, *sz); + fread(buf, 1, *sz, inf); + fclose(inf); + return buf; +} static void process_http_request(association *assoc, request *req) { @@ -1200,7 +1708,7 @@ 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"); @@ -1210,14 +1718,66 @@ static void process_http_request(association *assoc, request *req) p = z_get_HTTP_Response(o, 404); r = 1; } - if (r == 2 && !strcmp(hreq->path, "/test")) + 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 + { + int 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); @@ -1245,7 +1805,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) @@ -1260,7 +1820,7 @@ static void process_http_request(association *assoc, request *req) 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; @@ -1274,27 +1834,41 @@ static void process_http_request(association *assoc, request *req) 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(o, Z_SRW_update_response); + 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} }; @@ -1302,6 +1876,14 @@ static void process_http_request(association *assoc, request *req) 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); @@ -1558,13 +2140,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; } @@ -1738,7 +2324,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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)) { @@ -1757,13 +2344,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 (cb && assoc->maximumRecordSize > cb->maxrecordsize) - assoc->maximumRecordSize = cb->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; @@ -1776,7 +2362,7 @@ 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.62 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.109 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -1794,6 +2380,38 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } if (log_request) { + 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) @@ -1908,7 +2526,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, freq.print = a->print; freq.referenceId = referenceId; freq.schema = 0; - (*a->init->bend_fetch)(a->backend, &freq); + + retrieve_fetch(a, &freq); *next = freq.last_in_set ? 0 : recno + 1; @@ -2026,13 +2645,15 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, 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); @@ -2053,14 +2674,14 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrr->errstring = NULL; bsrr->search_info = NULL; - if (assoc->cql_transform && - req->query->which == Z_Query_type_104 && - req->query->u.type_104->which == Z_External_CQL) + 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->cql_transform, bsrr->query); + assoc->server->cql_transform, bsrr->query); if (srw_errcode) bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); } @@ -2094,10 +2715,9 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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); 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; @@ -2122,8 +2742,8 @@ 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); @@ -2154,21 +2774,49 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, { oident *prefformat; oid_value form; + int *presst = odr_intdup(assoc->encode, 0); 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); + + /* 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 = form; + 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 (!resp->records) + resp->records = pack_records(assoc, req->resultSetName, 1, + toget, compp, next, presst, form, 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 @@ -2176,24 +2824,43 @@ 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_printf(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_query_to_wrbuf(wr, req->query); yaz_log(log_request, "Search %s", wrbuf_buf(wr)); wrbuf_free(wr, 1); @@ -2291,11 +2958,11 @@ 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, @@ -2484,23 +3151,41 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) } if (log_request) { + int i; WRBUF wr = wrbuf_alloc(); - if (bsrr->errcode) + wrbuf_printf(wr, "Scan "); + for (i = 0 ; i < req->num_databaseNames; i++){ + if (i) + wrbuf_printf(wr, "+"); + wrbuf_printf(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"); + wrbuf_printf(wr, " "); + } else - wrbuf_printf(wr, "Partial"); + wrbuf_printf(wr, "OK "); + /* else if (*res->scanStatus == Z_Scan_success) */ + /* wrbuf_printf(wr, "OK "); */ + /* else */ + /* wrbuf_printf(wr, "Partial "); */ + + if (*res->numberOfEntriesReturned) + wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned); + else + wrbuf_printf(wr, "0 - "); - wrbuf_printf(wr, " %d+%d %d ", + wrbuf_printf(wr, "%d+%d+%d ", (req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1), *req->numberOfTermsRequested, - (res->stepSize ? *res->stepSize : 0)); - wrbuf_scan_term(wr, req->termListAndStartPoint, - bsrr->attributeset); - - yaz_log(log_request, "Scan %s", wrbuf_buf(wr) ); + (res->stepSize ? *res->stepSize : 1)); + + yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, + bsrr->attributeset); + yaz_log(log_request, "%s", wrbuf_buf(wr) ); wrbuf_free(wr, 1); } return apdu; @@ -2572,7 +3257,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, for (i = 0; inum_inputResultSetNames; i++) { if (i) - wrbuf_printf(wr, ","); + wrbuf_printf(wr, "+"); wrbuf_printf(wr, req->inputResultSetNames[i]); } wrbuf_printf(wr, ")->%s ",req->sortedResultSetName); @@ -2778,6 +3463,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; @@ -2785,8 +3471,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; @@ -2797,7 +3481,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 */ @@ -2809,13 +3510,13 @@ 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 @@ -2824,7 +3525,7 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) 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; @@ -2846,6 +3547,15 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) 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