X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=a0d79fa7760afd31130989b3dcbc5c807361ed3a;hp=d74a6171f27664da5acd6d6490f6964952d207f9;hb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;hpb=f33b2c6a4acc73dd7c876cb5c02aa75b2e9156b6 diff --git a/src/seshigh.c b/src/seshigh.c index d74a617..a0d79fa 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.84 2006-05-30 04:50:04 quinn Exp $ */ /** * \file seshigh.c @@ -50,7 +48,7 @@ #include #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #endif @@ -62,7 +60,7 @@ #include "session.h" #include "mime.h" #include -#include +#include #include #include #include @@ -72,9 +70,11 @@ #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); @@ -102,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, " "); } @@ -255,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 @@ -284,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; @@ -314,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 %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; - } - 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) { @@ -407,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); @@ -465,6 +495,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; @@ -496,22 +528,20 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S 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)); + 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 = odr_malloc(assoc->decode, len); + auth->u.open = (char *) odr_malloc(assoc->decode, len); strcpy(auth->u.open, sr->username); if (sr->password && *sr->password) { @@ -548,45 +578,18 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S return 1; } -static const char *get_esn(Z_RecordComposition *comp) -{ - if (comp && comp->which == Z_RecordComp_complex) - { - if (comp->u.complex->generic - && comp->u.complex->generic->elementSpec - && (comp->u.complex->generic->elementSpec->which == - Z_ElementSpec_elementSetName)) - return comp->u.complex->generic->elementSpec->u.elementSetName; - } - else if (comp && comp->which == Z_RecordComp_simple && - comp->u.simple->which == Z_ElementSetNames_generic) - return comp->u.simple->u.generic; - return 0; -} - -static void set_esn(Z_RecordComposition **comp_p, const char *esn, NMEM nmem) -{ - Z_RecordComposition *comp = nmem_malloc(nmem, sizeof(*comp)); - - comp->which = Z_RecordComp_simple; - comp->u.simple = nmem_malloc(nmem, sizeof(*comp->u.simple)); - comp->u.simple->which = Z_ElementSetNames_generic; - comp->u.simple->u.generic = nmem_strdup(nmem, esn); - *comp_p = comp; -} - static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 yaz_record_conv_t rc = 0; const char *match_schema = 0; - int *match_syntax = 0; + Odr_oid *match_syntax = 0; if (assoc->server) { int r; - const char *input_schema = get_esn(rr->comp); - Odr_oid *input_syntax_raw = rr->request_format_raw; + 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; @@ -612,7 +615,8 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) else if (r == 1 || r == 3) { const char *details = input_schema; - rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP; + rr->errcode = + YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_; if (details) rr->errstring = odr_strdup(rr->stream, details); return -1; @@ -623,26 +627,17 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) if (input_syntax_raw) { char oidbuf[OID_STR_MAX]; - oid_to_dotstring(input_syntax_raw, oidbuf); + oid_oid_to_dotstring(input_syntax_raw, oidbuf); rr->errstring = odr_strdup(rr->stream, oidbuf); } return -1; } if (backend_schema) { - set_esn(&rr->comp, backend_schema, rr->stream->mem); + yaz_set_esn(&rr->comp, backend_schema, odr_getmem(rr->stream)); } 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; - } + rr->request_format = backend_syntax; } (*assoc->init->bend_fetch)(assoc->backend, rr); if (rc && rr->record && rr->errcode == 0 && rr->len > 0) @@ -659,28 +654,26 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) else { rr->len = wrbuf_len(output_record); - rr->record = odr_malloc(rr->stream, rr->len); + rr->record = (char *) odr_malloc(rr->stream, rr->len); memcpy(rr->record, wrbuf_buf(output_record), rr->len); } - wrbuf_free(output_record, 1); + wrbuf_destroy(output_record); } if (match_syntax) - { - struct oident *oi = oid_getentbyoid(match_syntax); - rr->output_format = oi ? oi->value : VAL_NONE; - rr->output_format_raw = 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; @@ -688,10 +681,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_RECSYN, - 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; @@ -751,7 +742,7 @@ static int srw_bend_fetch(association *assoc, int pos, if (rr.errstring) len += strlen(rr.errstring); - record->recordData_buf = odr_malloc(o, len); + record->recordData_buf = (char *) odr_malloc(o, len); sprintf(record->recordData_buf, "\n" @@ -774,12 +765,14 @@ 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); - else - record->recordSchema = 0; + record->recordSchema = odr_strdup_null(o, rr.schema); + } + if (rr.errcode) + { + *addinfo = rr.errstring; + return rr.errcode; } - return rr.errcode; + return 0; } static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, @@ -855,6 +848,25 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, 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 10; /* 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_PDU *sr, Z_SRW_searchRetrieveResponse *srw_res, @@ -878,6 +890,8 @@ 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; @@ -990,107 +1004,125 @@ static void srw_bend_search(association *assoc, request *req, srw_res->resultSetIdleTime = odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - if (number > 0) + + 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; - 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); - } - else - { - 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) { - 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; bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode, - sizeof(*bprr->comp)); + 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; - 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); + } + 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; irequest) - return; - if (bprr->errcode) + srw_res->records[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) { - 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){ - if (!strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - if (!strcmp(srw_req->recordPacking, "url")) - packing = Z_SRW_recordPacking_URL; - } - 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); - 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++; + break; } - srw_res->num_records = j; - if (!j) - srw_res->records = 0; + 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); + } } } } @@ -1112,6 +1144,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) @@ -1127,15 +1161,15 @@ static void srw_bend_search(association *assoc, request *req, 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); + 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 HAVE_XML2 - xmlNodePtr ptr = rr->server_node_ptr; +#if YAZ_HAVE_XML2 + xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr; if (!ptr) return 0; for (ptr = ptr->children; ptr; ptr = ptr->next) @@ -1201,10 +1235,10 @@ static void srw_bend_explain(association *assoc, request *req, int packing = Z_SRW_recordPacking_string; if (srw_req->recordPacking) { - if (!strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - else if (!strcmp(srw_req->recordPacking, "url")) - packing = Z_SRW_recordPacking_URL; + 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; @@ -1247,12 +1281,14 @@ static void srw_bend_scan(association *assoc, request *req, 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 = 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; @@ -1267,20 +1303,11 @@ static void srw_bend_scan(association *assoc, request *req, 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, + &bsrr->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 *)) @@ -1292,8 +1319,9 @@ static void srw_bend_scan(association *assoc, request *req, { int srw_error; bsrr->scanClause = 0; - bsrr->attributeset = VAL_NONE; - bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term)); + 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, @@ -1312,7 +1340,7 @@ static void srw_bend_scan(association *assoc, request *req, && assoc->init->bend_srw_scan) { bsrr->term = 0; - bsrr->attributeset = VAL_NONE; + bsrr->attributeset = 0; bsrr->scanClause = srw_req->scanClause.cql; ((int (*)(void *, bend_scan_rr *)) (*assoc->init->bend_srw_scan))(assoc->backend, bsrr); @@ -1383,21 +1411,30 @@ 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) ); - wrbuf_free(wr, 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); } } @@ -1408,13 +1445,14 @@ static void srw_bend_update(association *assoc, request *req, int *http_code) { Z_SRW_updateRequest *srw_req = sr->u.update_request; - yaz_log(YLOG_DEBUG, "Got SRW UpdateRequest"); + 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; @@ -1423,165 +1461,214 @@ static void srw_bend_update(association *assoc, request *req, rr.operation = srw_req->operation; rr.operation_status = "failed"; rr.record_id = 0; - rr.record_version = 0; - rr.record_checksum = 0; - rr.record_old_version = 0; - rr.record_packing = "xml"; + rr.record_versions = 0; + rr.num_versions = 0; + rr.record_packing = "string"; rr.record_schema = 0; rr.record_data = 0; - rr.request_extra_record = 0; - rr.response_extra_record = 0; + rr.extra_record_data = 0; rr.extra_request_data = 0; rr.extra_response_data = 0; - rr.errcode = 0; - rr.errstring = 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->recordId ){ - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordId" ); - } - else { - rr.record_id = srw_req->recordId; - } - if ( !srw_req->recordVersion ){ - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordVersion" ); - } - else { - rr.record_version = odr_strdup( assoc->encode, - srw_req->recordVersion ); - + 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->recordOldVersion ){ - rr.record_old_version = odr_strdup(assoc->encode, - srw_req->recordOldVersion ); + if (srw_req->record) + { + rr.record_data = odr_strdupn( + assoc->encode, + srw_req->record->recordData_buf, + srw_req->record->recordData_len ); } - if ( srw_req->extraRequestData ){ - rr.extra_request_data = odr_strdup(assoc->encode, - srw_req->extraRequestData ); + 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 ){ - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordId" ); - } - else { + 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.recordSchema == 0 ){ - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordSchema" ); - } - else { - rr.record_schema = odr_strdup(assoc->encode, - srw_req->record.recordSchema ); - } - switch (srw_req->record.recordPacking) + if (!srw_req->record) { - case Z_SRW_recordPacking_string: - rr.record_packing = "string"; - break; - case Z_SRW_recordPacking_XML: - rr.record_packing = "xml"; - break; - case Z_SRW_recordPacking_URL: - rr.record_packing = "url"; - break; + yaz_add_sru_update_diagnostic( + assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + "record"); } - if ( srw_req->record.recordData_len ){ - rr.record_data = odr_strdupn(assoc->encode, - srw_req->record.recordData_buf, - srw_req->record.recordData_len ); - rr.request_extra_record = srw_req->extra_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" ); + } } - else { - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordData" ); + if (extra && extra->extraRecordData_len) + { + rr.extra_record_data = odr_strdupn( + assoc->encode, + extra->extraRecordData_buf, + extra->extraRecordData_len ); } - if (srw_req->extraRequestData) - rr.extra_request_data = odr_strdup(assoc->encode, - srw_req->extraRequestData ); } - else if ( !strcmp( rr.operation, "insert" ) ) + else if (!strcmp(rr.operation, "insert")) { - if ( srw_req->record.recordSchema == 0 ){ - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordSchema" ); - } - else { - rr.record_schema = odr_strdup(assoc->encode, - srw_req->record.recordSchema); - } - switch (srw_req->record.recordPacking) + if (srw_req->recordId) + rr.record_id = srw_req->recordId; + else if (extra) + rr.record_id = extra->recordIdentifier; + + if (srw_req->record) { - case Z_SRW_recordPacking_string: - rr.record_packing = "string"; - break; - case Z_SRW_recordPacking_XML: - rr.record_packing = "xml"; - break; - case Z_SRW_recordPacking_URL: - rr.record_packing = "url"; - break; - } + if (srw_req->record->recordSchema) + rr.record_schema = odr_strdup( + assoc->encode, srw_req->record->recordSchema); - if (srw_req->record.recordData_len) + 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.record_data = odr_strdupn(assoc->encode, - srw_req->record.recordData_buf, - srw_req->record.recordData_len ); - rr.request_extra_record = srw_req->extra_record; + rr.extra_record_data = odr_strdupn( + assoc->encode, + extra->extraRecordData_buf, + extra->extraRecordData_len ); } - else - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, - 7, "recordData" ); - if ( srw_req->extraRequestData ) - rr.extra_request_data = odr_strdup(assoc->encode, - srw_req->extraRequestData ); } + 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_log( YLOG_WARN, "Got No Update function!"); - return; - } + 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.errcode) - yaz_add_srw_diagnostic(assoc->encode, - &srw_res->diagnostics, - &srw_res->num_diagnostics, - rr.errcode, rr.errstring); + + 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->recordVersion = rr.record_version; - srw_res->recordChecksum = rr.record_checksum; - srw_res->extraResponseData = rr.extra_response_data; - srw_res->record.recordPosition = 0; + 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.recordSchema = rr.record_schema; - srw_res->record.recordPacking = srw_req->record.recordPacking; - srw_res->record.recordData_buf = rr.record_data; - srw_res->record.recordData_len = strlen(rr.record_data); - srw_res->extra_record = rr.response_extra_record; - - } - else - srw_res->record.recordData_len = 0; - *http_code = 200; + { + 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); + } + } } } @@ -1605,7 +1692,7 @@ static char *read_file(const char *fname, ODR o, int *sz) fseek(inf, 0L, SEEK_END); *sz = ftell(inf); rewind(inf); - buf = odr_malloc(o, *sz); + buf = (char *) odr_malloc(o, *sz); fread(buf, 1, *sz, inf); fclose(inf); return buf; @@ -1709,8 +1796,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) { @@ -1727,7 +1814,8 @@ 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) { @@ -1741,7 +1829,8 @@ static void process_http_request(association *assoc, request *req) } 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) { @@ -1755,7 +1844,8 @@ static void process_http_request(association *assoc, request *req) } else if (sr->which == Z_SRW_update_request) { - Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_update_response); + 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) { @@ -1779,17 +1869,14 @@ static void process_http_request(association *assoc, request *req) if (http_code == 200 || http_code == 500) { static Z_SOAP_Handler soap_handlers[4] = { -#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}, - {"http://www.loc.gov/zing/srw/update/", 0, - (Z_SOAP_fun) yaz_ucp_codec}, +#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; @@ -1807,7 +1894,7 @@ static void process_http_request(association *assoc, request *req) hres->code = http_code; strcpy(ctype, "text/xml"); - if (charset) + if (charset && strlen(charset) < sizeof(ctype)-30) { strcat(ctype, "; charset="); strcat(ctype, charset); @@ -2057,13 +2144,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; } @@ -2081,7 +2172,7 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res) static char *get_vhost(Z_OtherInformation *otherInfo) { - return yaz_oi_get_string_oidval(&otherInfo, VAL_PROXY, 1, 0); + return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0); } /* @@ -2152,7 +2243,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) else { /* no backend. return error */ - binitres = odr_malloc(assoc->encode, sizeof(*binitres)); + 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); @@ -2217,27 +2309,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)) { @@ -2256,13 +2357,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; @@ -2275,7 +2375,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.84 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.128 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -2338,8 +2438,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) (req->implementationVersion ? req->implementationVersion : "-") ); - 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; } @@ -2387,9 +2487,9 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, 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 = @@ -2431,10 +2531,8 @@ 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; @@ -2520,19 +2618,13 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisrec = (Z_NamePlusRecord *) odr_malloc(a->encode, sizeof(*thisrec)))) return 0; - if (freq.basename) - thisrec->databaseName = odr_strdup(a->encode, freq.basename); - else - thisrec->databaseName = 0; + 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; @@ -2558,13 +2650,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); @@ -2577,7 +2671,7 @@ 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->hits = 0; @@ -2596,6 +2690,18 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, 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 */ @@ -2626,10 +2732,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; @@ -2654,8 +2759,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); @@ -2684,14 +2789,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (*toget && !resp->records) { - oident *prefformat; - oid_value form; - - if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax))) - form = VAL_NONE; - else - form = prefformat->value; - + int *presst = odr_intdup(assoc->encode, 0); /* Call bend_present if defined */ if (assoc->init->bend_present) { @@ -2700,7 +2798,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, bprr->setname = req->resultSetName; bprr->start = 1; bprr->number = *toget; - bprr->format = form; + bprr->format = req->preferredRecordSyntax; bprr->comp = compp; bprr->referenceId = req->referenceId; bprr->stream = assoc->encode; @@ -2721,16 +2819,14 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } if (!resp->records) - resp->records = pack_records(assoc, req->resultSetName, 1, - toget, compp, next, presst, form, req->referenceId, - req->preferredRecordSyntax, NULL); + 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 @@ -2738,17 +2834,36 @@ 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 @@ -2757,8 +2872,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, req->resultSetName, returnedrecs); yaz_query_to_wrbuf(wr, req->query); - yaz_log(log_request, "Search %s", wrbuf_buf(wr)); - wrbuf_free(wr, 1); + yaz_log(log_request, "Search %s", wrbuf_cstr(wr)); + wrbuf_destroy(wr); } return apdu; } @@ -2782,8 +2897,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; @@ -2793,10 +2906,6 @@ 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->records = 0; resp->presentStatus = odr_intdup(assoc->encode, 0); @@ -2807,7 +2916,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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; @@ -2844,7 +2953,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, num, req->recordComposition, next, resp->presentStatus, - form, req->referenceId, req->preferredRecordSyntax, + req->referenceId, req->preferredRecordSyntax, &errcode); } if (log_request) @@ -2853,17 +2962,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; @@ -2888,7 +2997,6 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) Z_ListEntries *ents = (Z_ListEntries *) odr_malloc (assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; - oident *attset; bend_scan_rr *bsrr = (bend_scan_rr *) odr_malloc (assoc->encode, sizeof(*bsrr)); struct scan_entry *save_entries; @@ -2932,6 +3040,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) @@ -2943,8 +3053,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; @@ -2956,12 +3067,7 @@ 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; + bsrr->attributeset = req->attributeSet; log_scan_term_level (log_requestdetail, req->termListAndStartPoint, bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? @@ -3046,23 +3152,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_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"); else - wrbuf_printf(wr, "Partial"); + wrbuf_printf(wr, "OK"); - wrbuf_printf(wr, " %d+%d %d ", + wrbuf_printf(wr, " %d - %d+%d+%d", + res->numberOfEntriesReturned ? + *res->numberOfEntriesReturned : 0, (req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1), *req->numberOfTermsRequested, - (res->stepSize ? *res->stepSize : 0)); + (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, "Scan %s", wrbuf_buf(wr) ); - wrbuf_free(wr, 1); + yaz_log(log_request, "%s", wrbuf_cstr(wr) ); + wrbuf_destroy(wr); } return apdu; } @@ -3133,13 +3255,13 @@ 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); - 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; } @@ -3222,8 +3344,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; } @@ -3409,20 +3531,32 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) { 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