X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=711d7fefe5b7382c0c7d321370f4f59dcc11701c;hp=b806f810baea1d3a4eb237b7aaedcbaaf9f08906;hb=43a7aff23f364fd3fac6e9746c53cda01be13738;hpb=74d40e99d2ea24a62dd59ec39dd9c18a825a533d diff --git a/src/seshigh.c b/src/seshigh.c index b806f81..711d7fe 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1995-2004, Index Data + * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.37 2004-12-02 19:12:52 adam Exp $ + * $Id: seshigh.c,v 1.59 2005-08-22 20:34:21 adam Exp $ */ /** * \file seshigh.c @@ -30,18 +30,30 @@ #include #include +#include +#include + +#if HAVE_SYS_TYPES_H #include +#endif +#if HAVE_SYS_STAT_H +#include +#endif + #ifdef WIN32 #include #define S_ISREG(x) (x & _S_IFREG) #include -#include -#else -#include +#endif + +#if HAVE_UNISTD_H #include #endif -#include -#include + +#if HAVE_XML2 +#include +#include +#endif #include #include @@ -50,7 +62,7 @@ #include "session.h" #include #include -#include +#include #include #include #include @@ -68,7 +80,8 @@ void backend_response(IOCHAN i, int event); static int process_gdu_response(association *assoc, request *req, Z_GDU *res); static int process_z_response(association *assoc, request *req, Z_APDU *res); static Z_APDU *process_initRequest(association *assoc, request *reqb); -static Z_External *init_diagnostics(ODR odr, int errcode, char *errstring); +static Z_External *init_diagnostics(ODR odr, int errcode, + const char *errstring); static Z_APDU *process_searchRequest(association *assoc, request *reqb, int *fd); static Z_APDU *response_searchRequest(association *assoc, request *reqb, @@ -83,47 +96,52 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, int *fd); static Z_APDU *process_segmentRequest (association *assoc, request *reqb); -static FILE *apduf = 0; /* for use in static mode */ -static statserv_options_block *control_block = 0; - static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd); /* dynamic logging levels */ -static int logbits_set=0; -static int log_session=0; -static int log_request=0; /* one-line logs for requests */ -static int log_requestdetail=0; /* more detailed stuff */ +static int logbits_set = 0; +static int log_session = 0; +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() { /* needs to be called after parsing cmd-line args that can set loglevels!*/ if (!logbits_set) { - logbits_set=1; - log_session=yaz_log_module_level("session"); - log_request=yaz_log_module_level("request"); - log_requestdetail=yaz_log_module_level("requestdetail"); + logbits_set = 1; + log_session = yaz_log_module_level("session"); + log_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 : ""); +} + + /* * Create and initialize a new association-handle. * channel : iochannel for the current line. * link : communications channel. * Returns: 0 or a new association handle. */ -association *create_association(IOCHAN channel, COMSTACK link) +association *create_association(IOCHAN channel, COMSTACK link, + const char *apdufile) { association *anew; if (!logbits_set) get_logbits(); - if (!control_block) - control_block = statserv_getcontrol(); if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; anew->init = 0; anew->version = 0; + anew->last_control = 0; anew->client_chan = channel; anew->client_link = link; anew->cs_get_mask = 0; @@ -132,44 +150,26 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!(anew->decode = odr_createmem(ODR_DECODE)) || !(anew->encode = odr_createmem(ODR_ENCODE))) return 0; - if (*control_block->apdufile) + if (apdufile && *apdufile) { - char filename[256]; FILE *f; - strcpy(filename, control_block->apdufile); if (!(anew->print = odr_createmem(ODR_PRINT))) return 0; - if (*control_block->apdufile == '@') + if (*apdufile == '@') { odr_setprint(anew->print, yaz_log_file()); } - else if (*control_block->apdufile != '-') + else if (*apdufile != '-') { - strcpy(filename, control_block->apdufile); - if (!control_block->dynamic) - { - if (!apduf) - { - if (!(apduf = fopen(filename, "w"))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "can't open apdu dump %s", filename); - return 0; - } - setvbuf(apduf, 0, _IONBF, 0); - } - f = apduf; - } - else + char filename[256]; + sprintf(filename, "%.200s.%ld", apdufile, (long)getpid()); + if (!(f = fopen(filename, "w"))) { - sprintf(filename + strlen(filename), ".%d", getpid()); - if (!(f = fopen(filename, "w"))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename); - return 0; - } - setvbuf(f, 0, _IONBF, 0); + yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", filename); + return 0; } + setvbuf(f, 0, _IONBF, 0); odr_setprint(anew->print, f); } } @@ -182,6 +182,8 @@ 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; return anew; } @@ -210,7 +212,7 @@ void destroy_association(association *h) request_delq(&h->outgoing); xfree(h); xmalloc_trav("session closed"); - if (control_block && control_block->one_shot) + if (cb && cb->one_shot) { exit (0); } @@ -287,7 +289,6 @@ void ir_session(IOCHAN h, int event) } if (event & assoc->cs_accept_mask) { - yaz_log (log_session, "ir_session (accept)"); if (!cs_accept (conn)) { yaz_log (YLOG_WARN, "accept failed"); @@ -449,6 +450,7 @@ void ir_session(IOCHAN h, int event) static int process_z_request(association *assoc, request *req, char **msg); + static void assoc_init_reset(association *assoc) { xfree (assoc->init); @@ -470,6 +472,7 @@ static void assoc_init_reset(association *assoc) assoc->init->bend_segment = NULL; assoc->init->bend_fetch = NULL; assoc->init->bend_explain = NULL; + assoc->init->bend_srw_scan = NULL; assoc->init->charneg_request = NULL; assoc->init->charneg_response = NULL; @@ -477,30 +480,46 @@ static void assoc_init_reset(association *assoc) assoc->init->decode = assoc->decode; assoc->init->peer_name = odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); + + yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name); } -static int srw_bend_init(association *assoc) +static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) { - const char *encoding = "UTF-8"; - Z_External *ce; - bend_initresult *binitres; statserv_options_block *cb = statserv_getcontrol(); - - assoc_init_reset(assoc); + if (!assoc->init) + { + const char *encoding = "UTF-8"; + Z_External *ce; + bend_initresult *binitres; - assoc->maximumRecordSize = 3000000; - assoc->preferredMessageSize = 3000000; + yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname); + assoc_init_reset(assoc); + + assoc->maximumRecordSize = 3000000; + assoc->preferredMessageSize = 3000000; #if 1 - ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); - assoc->init->charneg_request = ce->u.charNeg3; + ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); + assoc->init->charneg_request = ce->u.charNeg3; #endif - assoc->backend = 0; - if (!(binitres = (*cb->bend_init)(assoc->init))) - { - yaz_log(YLOG_WARN, "Bad response from backend."); - return 0; + assoc->backend = 0; + if (!(binitres = (*cb->bend_init)(assoc->init))) + { + assoc->state = ASSOC_DEAD; + yaz_add_srw_diagnostic(assoc->encode, d, num, + YAZ_SRW_AUTHENTICATION_ERROR, 0); + return 0; + } + assoc->backend = binitres->handle; + if (binitres->errcode) + { + assoc->state = ASSOC_DEAD; + yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode, + binitres->errstring); + return 0; + } + return 1; } - assoc->backend = binitres->handle; return 1; } @@ -610,217 +629,328 @@ static int srw_bend_fetch(association *assoc, int pos, return rr.errcode; } -static void srw_bend_search(association *assoc, request *req, - Z_SRW_searchRetrieveRequest *srw_req, - Z_SRW_searchRetrieveResponse *srw_res, - int *http_code) +static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, + Z_Query *query_result) { - int srw_error = 0; - bend_search_rr rr; - Z_External *ext; - char *querystr=""; - - *http_code = 200; - yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest"); - yaz_log(YLOG_DEBUG, "srw_bend_search"); - if (!assoc->init) + /* have a CQL query and CQL to PQF transform .. */ + CQL_parser cp = cql_parser_create(); + int r; + int srw_errcode = 0; + const char *add = 0; + char rpn_buf[512]; + + r = cql_parser_string(cp, cql); + if (r) { - yaz_log(YLOG_DEBUG, "srw_bend_init"); - if (!srw_bend_init(assoc)) - { - srw_error = 3; /* assume Authentication error */ - - yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, - &srw_res->num_diagnostics, 1, 0); - yaz_log(log_request,"Search SRW: backend init failed"); - return; - } + /* CQL syntax error */ + srw_errcode = 10; } - - rr.setname = "default"; - rr.replace_set = 1; - rr.num_bases = 1; - rr.basenames = &srw_req->database; - rr.referenceId = 0; - - rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); - - if (srw_req->query_type == Z_SRW_query_type_cql) + if (!r) { - ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); - ext->direct_reference = odr_getoidbystr(assoc->decode, - "1.2.840.10003.16.2"); - ext->indirect_reference = 0; - ext->descriptor = 0; - ext->which = Z_External_CQL; - ext->u.cql = srw_req->query.cql; - querystr=srw_req->query.cql; - - rr.query->which = Z_Query_type_104; - rr.query->u.type_104 = ext; + /* Syntax OK */ + r = cql_transform_buf(ct, + cql_parser_result(cp), + rpn_buf, sizeof(rpn_buf)-1); + if (r) + srw_errcode = cql_transform_error(ct, &add); } - else if (srw_req->query_type == Z_SRW_query_type_pqf) + if (!r) { - Z_RPNQuery *RPNquery; - YAZ_PQF_Parser pqf_parser; - - pqf_parser = yaz_pqf_create (); - - querystr=srw_req->query.pqf; - RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, - srw_req->query.pqf); - if (!RPNquery) + /* Syntax & transform OK. */ + /* Convert PQF string to Z39.50 to RPN query struct */ + YAZ_PQF_Parser pp = yaz_pqf_create(); + Z_RPNQuery *rpnquery = yaz_pqf_parse(pp, odr, rpn_buf); + if (!rpnquery) { - const char *pqf_msg; size_t off; - int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); - yaz_log(log_requestdetail, "Parse error %d %s near offset %d", - code, pqf_msg, off); - srw_error = 10; + const char *pqf_msg; + int code = yaz_pqf_error(pp, &pqf_msg, &off); + yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)", + pqf_msg, code); + srw_errcode = 10; } - - rr.query->which = Z_Query_type_1; - rr.query->u.type_1 = RPNquery; - - yaz_pqf_destroy (pqf_parser); + else + { + query_result->which = Z_Query_type_1; + query_result->u.type_1 = rpnquery; + } + yaz_pqf_destroy(pp); } - else - srw_error = 11; - - if (!srw_error && srw_req->sort_type != Z_SRW_sort_type_none) - srw_error = 80; - - if (!srw_error && !assoc->init->bend_search) - srw_error = 1; + cql_parser_destroy(cp); + return srw_errcode; +} +static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, + Z_AttributesPlusTerm *result) +{ + Z_Query query; + Z_RPNQuery *rpn; + int srw_error = cql2pqf(odr, cql, ct, &query); if (srw_error) - { - if (log_request) + return srw_error; + if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101) + return 10; /* bad query type */ + rpn = query.u.type_1; + if (!rpn->RPNStructure) + return 10; /* must be structure */ + if (rpn->RPNStructure->which != Z_RPNStructure_simple) + return 10; /* must be simple */ + if (rpn->RPNStructure->u.simple->which != Z_Operand_APT) + return 10; /* must be attributes plus term node .. */ + memcpy(result, rpn->RPNStructure->u.simple->u.attributesPlusTerm, + sizeof(*result)); + return 0; +} + +static void srw_bend_search(association *assoc, request *req, + Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_searchRetrieveResponse *srw_res, + int *http_code) +{ + int srw_error = 0; + Z_External *ext; + + *http_code = 200; + yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest"); + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); + if (srw_res->num_diagnostics == 0 && assoc->init) + { + bend_search_rr rr; + rr.setname = "default"; + rr.replace_set = 1; + rr.num_bases = 1; + rr.basenames = &srw_req->database; + rr.referenceId = 0; + rr.srw_sortKeys = 0; + + rr.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) { - WRBUF wr=wrbuf_alloc(); - wrbuf_printf(wr, "Search: SRW: %s ",querystr); - wrbuf_printf(wr," ERROR %d ", srw_error); - yaz_log(log_request, "Search %s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); + if (assoc->cql_transform) + { + int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql, + assoc->cql_transform, rr.query); + if (srw_errcode) + { + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_errcode, 0); + } + } + else + { + /* CQL query to backend. Wrap it - Z39.50 style */ + ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(assoc->decode, + "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = srw_req->query.cql; + + rr.query->which = Z_Query_type_104; + rr.query->u.type_104 = ext; + } } - srw_res->num_diagnostics = 1; - srw_res->diagnostics = (Z_SRW_diagnostic *) - odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); - yaz_mk_std_diagnostic(assoc->encode, - srw_res->diagnostics, srw_error, 0); - return; - } - - rr.stream = assoc->encode; - rr.decode = assoc->decode; - rr.print = assoc->print; - rr.request = req; - rr.association = assoc; - rr.fd = 0; - rr.hits = 0; - rr.errcode = 0; - rr.errstring = 0; - rr.search_info = 0; - yaz_log_zquery_level(log_requestdetail,rr.query); - - (assoc->init->bend_search)(assoc->backend, &rr); - if (rr.errcode) - { - yaz_log(log_request, "bend_search returned Bib-1 code %d", rr.errcode); - if (rr.errcode == 109) /* database unavailable */ + else if (srw_req->query_type == Z_SRW_query_type_pqf) { - *http_code = 404; - return; + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create (); + + RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, + srw_req->query.pqf); + if (!RPNquery) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + yaz_log(log_requestdetail, "Parse error %d %s near offset %d", + code, pqf_msg, off); + srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR; + } + + rr.query->which = Z_Query_type_1; + rr.query->u.type_1 = RPNquery; + + yaz_pqf_destroy (pqf_parser); } - srw_res->num_diagnostics = 1; - srw_res->diagnostics = (Z_SRW_diagnostic *) - odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); - yaz_mk_std_diagnostic(assoc->encode, srw_res->diagnostics, - yaz_diag_bib1_to_srw (rr.errcode), - rr.errstring); - yaz_log(log_request, "srw_bend_search returned SRW error %s", - srw_res->diagnostics[0].uri); - } - else - { - int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0; - int start = srw_req->startRecord ? *srw_req->startRecord : 1; - - yaz_log(log_requestdetail, "Request to pack %d+%d out of %d", - start, number, rr.hits); - - srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); - if (number > 0) + else { - int i; - - if (start > rr.hits) + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_UNSUPP_QUERY_TYPE, 0); + } + if (rr.query->u.type_1) + { + rr.stream = assoc->encode; + rr.decode = assoc->decode; + rr.print = assoc->print; + rr.request = req; + if ( srw_req->sort.sortKeys ) + rr.srw_sortKeys = odr_strdup(assoc->encode, + srw_req->sort.sortKeys ); + rr.association = assoc; + rr.fd = 0; + rr.hits = 0; + rr.errcode = 0; + rr.errstring = 0; + rr.search_info = 0; + yaz_log_zquery_level(log_requestdetail,rr.query); + + (assoc->init->bend_search)(assoc->backend, &rr); + if (rr.errcode) { - srw_res->num_diagnostics = 1; - srw_res->diagnostics = (Z_SRW_diagnostic *) - odr_malloc(assoc->encode, - sizeof(*srw_res->diagnostics)); - yaz_mk_std_diagnostic(assoc->encode, srw_res->diagnostics, - 61, 0); + if (rr.errcode == YAZ_BIB1_DATABASE_UNAVAILABLE) + { + *http_code = 404; + } + else + { + srw_error = yaz_diag_bib1_to_srw (rr.errcode); + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, rr.errstring); + } } else { - int j = 0; - int packing = Z_SRW_recordPacking_string; - if (start + number > rr.hits) - number = rr.hits - start + 1; - if (srw_req->recordPacking && - !strcmp(srw_req->recordPacking, "xml")) - packing = Z_SRW_recordPacking_XML; - srw_res->records = (Z_SRW_record *) - odr_malloc(assoc->encode, - number * sizeof(*srw_res->records)); - for (i = 0; imaximumRecords ? *srw_req->maximumRecords : 0; + int start = srw_req->startRecord ? *srw_req->startRecord : 1; + + yaz_log(log_requestdetail, "Request to pack %d+%d out of %d", + start, number, rr.hits); + + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); + if (number > 0) { - int errcode; + int i; - srw_res->records[j].recordPacking = packing; - srw_res->records[j].recordData_buf = 0; - yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); - errcode = srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); - if (errcode) + if (start > rr.hits) + { + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + } + else { - srw_res->num_diagnostics = 1; - srw_res->diagnostics = (Z_SRW_diagnostic *) - odr_malloc(assoc->encode, - sizeof(*srw_res->diagnostics)); - - yaz_mk_std_diagnostic(assoc->encode, - srw_res->diagnostics, - yaz_diag_bib1_to_srw (errcode), - rr.errstring); - break; + int j = 0; + int packing = Z_SRW_recordPacking_string; + if (start + number > rr.hits) + number = rr.hits - start + 1; + if (srw_req->recordPacking && + !strcmp(srw_req->recordPacking, "xml")) + packing = Z_SRW_recordPacking_XML; + srw_res->records = (Z_SRW_record *) + odr_malloc(assoc->encode, + number * sizeof(*srw_res->records)); + for (i = 0; irecords[j].recordPacking = packing; + srw_res->records[j].recordData_buf = 0; + yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); + errcode = srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j); + if (errcode) + { + yaz_add_srw_diagnostic(assoc->encode, + &srw_res->diagnostics, + &srw_res->num_diagnostics, + yaz_diag_bib1_to_srw (errcode), + rr.errstring); + + break; + } + if (srw_res->records[j].recordData_buf) + j++; + } + srw_res->num_records = j; + if (!j) + srw_res->records = 0; } - if (srw_res->records[j].recordData_buf) - j++; } - srw_res->num_records = j; - if (!j) - srw_res->records = 0; } } } if (log_request) { - WRBUF wr=wrbuf_alloc(); - wrbuf_printf(wr,"SRW: %s",querystr ); - if (srw_error) - wrbuf_printf(wr," ERROR %d ", srw_error); - else + const char *querystr = "?"; + const char *querytype = "?"; + WRBUF wr = wrbuf_alloc(); + + switch (srw_req->query_type) + { + case Z_SRW_query_type_cql: + querytype = "CQL"; + querystr = srw_req->query.cql; + break; + case Z_SRW_query_type_pqf: + querytype = "PQF"; + querystr = srw_req->query.pqf; + break; + } + wrbuf_printf(wr, "SRWSearch "); + if (srw_res->num_diagnostics) + wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri); + else if (*http_code != 200) + wrbuf_printf(wr, "ERROR info:http/%d", *http_code); + else if (srw_res->numberOfRecords) + { + wrbuf_printf(wr, "OK %d", + (srw_res->numberOfRecords ? + *srw_res->numberOfRecords : 0)); + } + wrbuf_printf(wr, " %s %d+%d", + (srw_res->resultSetId ? + srw_res->resultSetId : "-"), + (srw_req->startRecord ? *srw_req->startRecord : 1), + srw_res->num_records); + yaz_log(log_request, "%s %s: %s", wrbuf_buf(wr), querytype, querystr); + wrbuf_free(wr, 1); + } +} + +static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) +{ +#if HAVE_XML2 + xmlNodePtr ptr = rr->server_node_ptr; + if (!ptr) + return 0; + for (ptr = ptr->children; ptr; ptr = ptr->next) + { + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) ptr->name, "explain")) { - wrbuf_printf(wr," OK:%d hits ",rr.hits); - if (srw_res->num_records) - wrbuf_printf(wr," Returned %d records", srw_res->num_records); + int len; + xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0"); + xmlChar *buf_out; + char *content; + + ptr = xmlCopyNode(ptr, 1); + + xmlDocSetRootElement(doc, ptr); + + xmlDocDumpMemory(doc, &buf_out, &len); + content = (char*) odr_malloc(rr->stream, 1+len); + memcpy(content, buf_out, len); + content[len] = '\0'; + + xmlFree(buf_out); + xmlFreeDoc(doc); + rr->explain_buf = content; + return 0; } - yaz_log(log_request, "Search %s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); } +#endif + return 0; } static void srw_bend_explain(association *assoc, request *req, @@ -830,25 +960,23 @@ static void srw_bend_explain(association *assoc, request *req, { yaz_log(log_requestdetail, "Got SRW ExplainRequest"); *http_code = 404; - if (!assoc->init) - { - yaz_log(YLOG_DEBUG, "srw_bend_init"); - if (!srw_bend_init(assoc)) - { - return; - } - } - if (assoc->init && assoc->init->bend_explain) + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); + if (assoc->init) { bend_explain_rr rr; - + rr.stream = assoc->encode; rr.decode = assoc->decode; rr.print = assoc->print; rr.explain_buf = 0; rr.database = srw_req->database; + rr.server_node_ptr = assoc->server_node_ptr; rr.schema = "http://explain.z3950.org/dtd/2.0/"; - (*assoc->init->bend_explain)(assoc->backend, &rr); + if (assoc->init->bend_explain) + (*assoc->init->bend_explain)(assoc->backend, &rr); + else + srw_bend_explain_default(assoc->backend, &rr); + if (rr.explain_buf) { int packing = Z_SRW_recordPacking_string; @@ -865,6 +993,193 @@ 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_scanResponse *srw_res, + int *http_code) +{ + yaz_log(log_requestdetail, "Got SRW ScanRequest"); + + *http_code = 200; + srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics); + if (srw_res->num_diagnostics == 0 && assoc->init) + { + struct scan_entry *save_entries; + + bend_scan_rr *bsrr = (bend_scan_rr *) + odr_malloc (assoc->encode, sizeof(*bsrr)); + bsrr->num_bases = 1; + bsrr->basenames = &srw_req->database; + + bsrr->num_entries = srw_req->maximumTerms ? + *srw_req->maximumTerms : 10; + bsrr->term_position = srw_req->responsePosition ? + *srw_req->responsePosition : 1; + + bsrr->errcode = 0; + bsrr->errstring = 0; + bsrr->referenceId = 0; + bsrr->stream = assoc->encode; + bsrr->print = assoc->print; + bsrr->step_size = odr_intdup(assoc->decode, 0); + bsrr->entries = 0; + + if (bsrr->num_entries > 0) + { + int i; + bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) * + bsrr->num_entries); + for (i = 0; inum_entries; i++) + { + bsrr->entries[i].term = 0; + bsrr->entries[i].occurrences = 0; + bsrr->entries[i].errcode = 0; + bsrr->entries[i].errstring = 0; + bsrr->entries[i].display_term = 0; + } + } + save_entries = bsrr->entries; /* save it so we can compare later */ + + if (srw_req->query_type == Z_SRW_query_type_pqf && + assoc->init->bend_scan) + { + Odr_oid *scan_attributeSet = 0; + oident *attset; + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + + bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode, + &scan_attributeSet, + srw_req->scanClause.pqf); + if (scan_attributeSet && + (attset = oid_getentbyoid(scan_attributeSet)) && + (attset->oclass == CLASS_ATTSET || + attset->oclass == CLASS_GENERAL)) + bsrr->attributeset = attset->value; + else + bsrr->attributeset = VAL_NONE; + yaz_pqf_destroy(pqf_parser); + bsrr->scanClause = 0; + ((int (*)(void *, bend_scan_rr *)) + (*assoc->init->bend_scan))(assoc->backend, bsrr); + } + else if (srw_req->query_type == Z_SRW_query_type_cql + && assoc->init->bend_srw_scan) + { + 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); + } + } + 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); + } + } + else + { + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + YAZ_SRW_UNSUPP_OPERATION, "scan"); + } + if (bsrr->errcode) + { + int srw_error; + if (bsrr->errcode == YAZ_BIB1_DATABASE_UNAVAILABLE) + { + *http_code = 404; + return; + } + srw_error = yaz_diag_bib1_to_srw (bsrr->errcode); + + yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, + &srw_res->num_diagnostics, + srw_error, bsrr->errstring); + } + else if (srw_res->num_diagnostics == 0 && bsrr->num_entries) + { + int i; + srw_res->terms = (Z_SRW_scanTerm*) + odr_malloc(assoc->encode, sizeof(*srw_res->terms) * + bsrr->num_entries); + + srw_res->num_terms = bsrr->num_entries; + for (i = 0; inum_entries; i++) + { + Z_SRW_scanTerm *t = srw_res->terms + i; + t->value = odr_strdup(assoc->encode, bsrr->entries[i].term); + t->numberOfRecords = + odr_intdup(assoc->encode, bsrr->entries[i].occurrences); + t->displayTerm = 0; + if (save_entries == bsrr->entries && + bsrr->entries[i].display_term) + { + /* the entries was _not_ set by the handler. So it's + safe to test for new member display_term. It is + NULL'ed by us. + */ + t->displayTerm = odr_strdup(assoc->encode, + bsrr->entries[i].display_term); + } + t->whereInList = 0; + } + } + } + if (log_request) + { + WRBUF wr = wrbuf_alloc(); + const char *querytype = 0; + const char *querystr = 0; + + switch(srw_req->query_type) + { + case Z_SRW_query_type_pqf: + querytype = "PQF"; + querystr = srw_req->scanClause.pqf; + break; + case Z_SRW_query_type_cql: + querytype = "CQL"; + querystr = srw_req->scanClause.cql; + break; + default: + querytype = "Unknown"; + querystr = ""; + } + wrbuf_printf(wr, "SRWScan %d+%d", + (srw_req->responsePosition ? + *srw_req->responsePosition : 1), + (srw_req->maximumTerms ? + *srw_req->maximumTerms : 1)); + if (srw_res->num_diagnostics) + wrbuf_printf(wr, " ERROR %s", srw_res->diagnostics[0].uri); + else + wrbuf_printf(wr, " OK -"); + wrbuf_printf(wr, " %s: %s", querytype, querystr); + yaz_log(log_request, "%s", wrbuf_buf(wr) ); + wrbuf_free(wr, 1); + } + +} + + static void process_http_request(association *assoc, request *req) { Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request; @@ -879,8 +1194,14 @@ static void process_http_request(association *assoc, request *req) char *stylesheet = 0; Z_SRW_diagnostic *diagnostic = 0; int num_diagnostic = 0; + const char *host = z_HTTP_header_lookup(hreq->headers, "Host"); - if (!strcmp(hreq->path, "/test")) + if (!control_association(assoc, host, 0)) + { + p = z_get_HTTP_Response(o, 404); + r = 1; + } + if (r == 2 && !strcmp(hreq->path, "/test")) { p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; @@ -944,16 +1265,14 @@ static void process_http_request(association *assoc, request *req) res->u.scan_response->diagnostics = diagnostic; res->u.scan_response->num_diagnostics = num_diagnostic; } - yaz_add_srw_diagnostic(o, - &res->u.scan_response->diagnostics, - &res->u.scan_response->num_diagnostics, - 4, "scan"); + srw_bend_scan(assoc, req, sr->u.scan_request, + res->u.scan_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } else { - yaz_log(log_request, "generate soap error"); + yaz_log(log_request, "SOAP ERROR"); /* FIXME - what error, what query */ http_code = 500; z_soap_error(assoc->encode, soap_package, @@ -1023,7 +1342,7 @@ static void process_http_request(association *assoc, request *req) int t; const char *alive = z_HTTP_header_lookup(hreq->headers, "Keep-Alive"); - if (alive && isdigit(*alive)) + if (alive && isdigit(*(const unsigned char *) alive)) t = atoi(alive); else t = 15; @@ -1071,8 +1390,6 @@ static int process_z_request(association *assoc, request *req, char **msg) switch (req->apdu_request->which) { case Z_APDU_initRequest: - iochan_settimeout(assoc->client_chan, - statserv_getcontrol()->idle_timeout * 60); res = process_initRequest(assoc, req); break; case Z_APDU_searchRequest: res = process_searchRequest(assoc, req, &fd); break; @@ -1152,7 +1469,7 @@ static int process_z_request(association *assoc, request *req, char **msg) yaz_log(YLOG_DEBUG, " establishing handler for result"); req->state = REQUEST_PENDING; - if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT))) + if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT, 0))) abort(); iochan_setdata(chan, assoc); retval = 0; @@ -1254,6 +1571,10 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res) return process_gdu_response(assoc, req, gres); } +static char *get_vhost(Z_OtherInformation *otherInfo) +{ + return yaz_oi_get_string_oidval(&otherInfo, VAL_PROXY, 1, 0); +} /* * Handle init request. @@ -1264,22 +1585,28 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res) */ static Z_APDU *process_initRequest(association *assoc, request *reqb) { - statserv_options_block *cb = statserv_getcontrol(); Z_InitRequest *req = reqb->apdu_request->u.initRequest; Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse); Z_InitResponse *resp = apdu->u.initResponse; bend_initresult *binitres; char *version; char options[140]; + statserv_options_block *cb = 0; /* by default no control for backend */ + if (control_association(assoc, get_vhost(req->otherInfo), 1)) + cb = statserv_getcontrol(); /* got control block for backend */ + yaz_log(log_requestdetail, "Got initRequest"); if (req->implementationId) - yaz_log(log_requestdetail, "Id: %s", req->implementationId); + yaz_log(log_requestdetail, "Id: %s", + req->implementationId); if (req->implementationName) - yaz_log(log_requestdetail, "Name: %s", req->implementationName); + yaz_log(log_requestdetail, "Name: %s", + req->implementationName); if (req->implementationVersion) - yaz_log(log_requestdetail, "Version: %s", req->implementationVersion); - + yaz_log(log_requestdetail, "Version: %s", + req->implementationVersion); + assoc_init_reset(assoc); assoc->init->auth = req->idAuthentication; @@ -1295,13 +1622,30 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } assoc->backend = 0; - if (!(binitres = (*cb->bend_init)(assoc->init))) + if (cb) { - yaz_log(YLOG_WARN, "Bad response from backend."); - return 0; + if (req->implementationVersion) + yaz_log(log_requestdetail, "Config: %s", + cb->configname); + + iochan_settimeout(assoc->client_chan, cb->idle_timeout * 60); + + /* we have a backend control block, so call that init function */ + if (!(binitres = (*cb->bend_init)(assoc->init))) + { + yaz_log(YLOG_WARN, "Bad response from backend."); + return 0; + } + assoc->backend = binitres->handle; + } + else + { + /* no backend. return error */ + binitres = odr_malloc(assoc->encode, sizeof(*binitres)); + binitres->errstring = 0; + binitres->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR; + iochan_settimeout(assoc->client_chan, 10); } - - assoc->backend = binitres->handle; if ((assoc->init->bend_sort)) yaz_log (YLOG_DEBUG, "Sort handler installed"); if ((assoc->init->bend_search)) @@ -1402,8 +1746,9 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options); assoc->maximumRecordSize = *req->maximumRecordSize; - if (assoc->maximumRecordSize > control_block->maxrecordsize) - assoc->maximumRecordSize = control_block->maxrecordsize; + + if (cb && assoc->maximumRecordSize > cb->maxrecordsize) + assoc->maximumRecordSize = cb->maxrecordsize; assoc->preferredMessageSize = *req->preferredMessageSize; if (assoc->preferredMessageSize > assoc->maximumRecordSize) assoc->preferredMessageSize = assoc->maximumRecordSize; @@ -1419,7 +1764,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.37 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.59 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -1429,105 +1774,44 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (binitres->errcode) { - yaz_log(YLOG_DEBUG, "Connection rejected by backend."); - *resp->result = 0; assoc->state = ASSOC_DEAD; - resp->userInformationField = init_diagnostics(assoc->encode, - binitres->errcode, - binitres->errstring); - yaz_log(log_request,"Init from '%s' (%s) (ver %s) Error %d %s", - req->implementationName ? req->implementationName :"??", - req->implementationId ? req->implementationId :"?", - req->implementationVersion ? req->implementationVersion: "?", - binitres->errcode,binitres->errstring ); + resp->userInformationField = + init_diagnostics(assoc->encode, binitres->errcode, + binitres->errstring); + *resp->result = 0; } - else + if (log_request) { - assoc->state = ASSOC_UP; - yaz_log(log_request,"Init from '%s' (%s) (ver %s) OK", - req->implementationName ? req->implementationName :"??", - req->implementationId ? req->implementationId :"?", - req->implementationVersion ? req->implementationVersion: "?"); + WRBUF wr = wrbuf_alloc(); + wrbuf_printf(wr, "Init "); + if (binitres->errcode) + wrbuf_printf(wr, "ERROR %d", binitres->errcode); + else + wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, " ID:%s Name:%s Version:%s", + (req->implementationId ? req->implementationId :"-"), + (req->implementationName ? + req->implementationName : "-"), + (req->implementationVersion ? + req->implementationVersion : "-") + ); + yaz_log(log_request, "%s", wrbuf_buf(wr)); + wrbuf_free(wr, 1); } - return apdu; } /* - * Diagnostic in default format, to be returned as either a surrogate - * or non-surrogate diagnostic in the context of an open session, or - * as User-information when an Init is refused. - */ -static Z_DefaultDiagFormat *justdiag(ODR odr, int error, char *addinfo) -{ - int *err = odr_intdup(odr, error); - Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) - odr_malloc (odr, sizeof(*dr)); - - yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), - addinfo ? " -- " : "", addinfo ? addinfo : ""); - - dr->diagnosticSetId = - yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1); - dr->condition = err; - dr->which = Z_DefaultDiagFormat_v2Addinfo; - dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); - return dr; -} - -/* * Set the specified `errcode' and `errstring' into a UserInfo-1 * external to be returned to the client in accordance with Z35.90 * Implementor Agreement 5 (Returning diagnostics in an InitResponse): * http://lcweb.loc.gov/z3950/agency/agree/initdiag.html */ -static Z_External *init_diagnostics(ODR odr, int error, char *addinfo) +static Z_External *init_diagnostics(ODR odr, int error, const char *addinfo) { - Z_External *x, *x2; - oident oid; - Z_OtherInformation *u; - Z_OtherInformationUnit *l; - Z_DiagnosticFormat *d; - Z_DiagnosticFormat_s *e; - - x = (Z_External*) odr_malloc(odr, sizeof *x); - x->descriptor = 0; - x->indirect_reference = 0; - oid.proto = PROTO_Z3950; - oid.oclass = CLASS_USERINFO; - oid.value = VAL_USERINFO1; - x->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid)); - x->which = Z_External_userInfo1; - - u = odr_malloc(odr, sizeof *u); - x->u.userInfo1 = u; - u->num_elements = 1; - u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list); - u->list[0] = (Z_OtherInformationUnit*) odr_malloc(odr, sizeof *u->list[0]); - l = u->list[0]; - l->category = 0; - l->which = Z_OtherInfo_externallyDefinedInfo; - - x2 = (Z_External*) odr_malloc(odr, sizeof *x); - l->information.externallyDefinedInfo = x2; - x2->descriptor = 0; - x2->indirect_reference = 0; - oid.oclass = CLASS_DIAGSET; - oid.value = VAL_DIAG1; - x2->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid)); - x2->which = Z_External_diag1; - - d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d); - x2->u.diag1 = d; - d->num = 1; - d->elements = (Z_DiagnosticFormat_s**) odr_malloc (odr, sizeof *d->elements); - d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc (odr, sizeof *d->elements[0]); - e = d->elements[0]; - - e->which = Z_DiagnosticFormat_s_defaultDiagRec; - e->u.defaultDiagRec = justdiag(odr, error, addinfo); - e->message = 0; - return x; + yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), + addinfo ? " -- " : "", addinfo ? addinfo : ""); + return zget_init_diagnostics(odr, error, addinfo); } /* @@ -1535,60 +1819,27 @@ static Z_External *init_diagnostics(ODR odr, int error, char *addinfo) */ static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - Z_Records *rec = (Z_Records *) - odr_malloc (assoc->encode, sizeof(*rec)); - rec->which = Z_Records_NSD; - rec->u.nonSurrogateDiagnostic = justdiag(assoc->encode, error, addinfo); - return rec; -} + Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec)); -/* - * surrogate diagnostic. - */ -static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, - int error, char *addinfo) -{ - Z_NamePlusRecord *rec = (Z_NamePlusRecord *) - odr_malloc (assoc->encode, sizeof(*rec)); - Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); - - yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); - rec->databaseName = dbname; - rec->which = Z_NamePlusRecord_surrogateDiagnostic; - rec->u.surrogateDiagnostic = drec; - drec->which = Z_DiagRec_defaultFormat; - drec->u.defaultFormat = justdiag(assoc->encode, error, addinfo); + yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), + addinfo ? " -- " : "", addinfo ? addinfo : ""); + rec->which = Z_Records_NSD; + rec->u.nonSurrogateDiagnostic = zget_DefaultDiagFormat(assoc->encode, + error, addinfo); return rec; } /* - * multiple nonsurrogate diagnostics. + * surrogate diagnostic. */ -static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) +static Z_NamePlusRecord *surrogatediagrec(association *assoc, + const char *dbname, + int error, const char *addinfo) { - Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs)); - int *err = odr_intdup(assoc->encode, error); - Z_DiagRec **recp = (Z_DiagRec **)odr_malloc (assoc->encode, sizeof(*recp)); - Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *) - odr_malloc (assoc->encode, sizeof(*rec)); - - yaz_log(YLOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : ""); - - recs->num_diagRecs = 1; - recs->diagRecs = recp; - recp[0] = drec; - drec->which = Z_DiagRec_defaultFormat; - drec->u.defaultFormat = rec; - - rec->diagnosticSetId = - yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); - rec->condition = err; - - rec->which = Z_DefaultDiagFormat_v2Addinfo; - rec->u.v2Addinfo = odr_strdup (assoc->encode, addinfo ? addinfo : ""); - return recs; + yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), + addinfo ? " -- " : "", addinfo ? addinfo : ""); + return zget_surrogateDiagRec(assoc->encode, dbname, error, addinfo); } static Z_Records *pack_records(association *a, char *setname, int start, @@ -1605,7 +1856,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, Z_NamePlusRecord **list = (Z_NamePlusRecord **) odr_malloc (a->encode, sizeof(*list) * toget); - *errcode=0; records->which = Z_Records_DBOSD; records->u.databaseOrSurDiagnostics = reclist; reclist->num_records = 0; @@ -1647,6 +1897,9 @@ static Z_Records *pack_records(association *a, char *setname, int start, freq.referenceId = referenceId; freq.schema = 0; (*a->init->bend_fetch)(a->backend, &freq); + + *next = freq.last_in_set ? 0 : recno + 1; + /* backend should be able to signal whether error is system-wide or only pertaining to current record */ if (freq.errcode) @@ -1657,22 +1910,27 @@ static Z_Records *pack_records(association *a, char *setname, int start, *pres = Z_PresentStatus_failure; /* for 'present request out of range', set addinfo to record position if not set */ - if (freq.errcode == 13 && freq.errstring == 0) + if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE && + freq.errstring == 0) { sprintf (s, "%d", recno); freq.errstring = s; } if (errcode) - *errcode=freq.errcode; + *errcode = freq.errcode; return diagrec(a, freq.errcode, freq.errstring); } reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, freq.errcode, freq.errstring); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; continue; } + if (freq.record == 0) /* no error and no record ? */ + { + *next = 0; /* signal end-of-set and stop */ + break; + } if (freq.len >= 0) this_length = freq.len; else @@ -1699,7 +1957,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, 16, 0); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; dumped_records += this_length; continue; } @@ -1711,7 +1968,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist->records[reclist->num_records] = surrogatediagrec(a, freq.basename, 17, 0); reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; dumped_records += this_length; continue; } @@ -1720,10 +1976,10 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisrec = (Z_NamePlusRecord *) odr_malloc(a->encode, sizeof(*thisrec)))) return 0; - if (!(thisrec->databaseName = (char *)odr_malloc(a->encode, - strlen(freq.basename) + 1))) - return 0; - strcpy(thisrec->databaseName, freq.basename); + if (freq.basename) + thisrec->databaseName = odr_strdup(a->encode, freq.basename); + else + thisrec->databaseName = 0; thisrec->which = Z_NamePlusRecord_databaseRecord; if (freq.output_format_raw) @@ -1737,7 +1993,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, return 0; reclist->records[reclist->num_records] = thisrec; reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; } *num = reclist->num_records; return records; @@ -1756,6 +2011,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrr->association = assoc; bsrr->referenceId = req->referenceId; save_referenceId (reqb, bsrr->referenceId); + bsrr->srw_sortKeys = 0; yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) @@ -1778,11 +2034,24 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, nmem_transfer(bsrr->stream->mem, reqb->request_mem); bsrr->decode = assoc->decode; bsrr->print = assoc->print; - bsrr->errcode = 0; bsrr->hits = 0; + bsrr->errcode = 0; bsrr->errstring = NULL; bsrr->search_info = NULL; - (assoc->init->bend_search)(assoc->backend, bsrr); + + if (assoc->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); + if (srw_errcode) + bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); + } + if (!bsrr->errcode) + (assoc->init->bend_search)(assoc->backend, bsrr); if (!bsrr->request) /* backend not ready with the search response */ return 0; /* should not be used any more */ } @@ -1877,12 +2146,12 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, else form = prefformat->value; resp->records = pack_records(assoc, req->resultSetName, 1, - toget, compp, next, presst, form, req->referenceId, - req->preferredRecordSyntax, NULL); + toget, compp, next, presst, form, req->referenceId, + req->preferredRecordSyntax, NULL); if (!resp->records) return 0; resp->numberOfRecordsReturned = toget; - returnedrecs=*toget; + returnedrecs = *toget; resp->nextResultSetPosition = next; resp->searchStatus = sr; resp->resultSetStatus = 0; @@ -1903,18 +2172,17 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (log_request) { - WRBUF wr=wrbuf_alloc(); - wrbuf_put_zquery(wr, req->query); + WRBUF wr = wrbuf_alloc(); if (bsrt->errcode) - wrbuf_printf(wr," ERROR %d %s", bsrt->errcode, bsrt->errstring); + wrbuf_printf(wr, "ERROR %d", bsrt->errcode); else - { - wrbuf_printf(wr," OK:%d hits ",bsrt->hits); - if (returnedrecs) - wrbuf_printf(wr," Returned %d records", returnedrecs); - } - yaz_log(log_request, "Search %s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); + wrbuf_printf(wr, "OK %d", bsrt->hits); + wrbuf_printf(wr, " %s 1+%d ", + req->resultSetName, returnedrecs); + wrbuf_put_zquery(wr, req->query); + + yaz_log(log_request, "Search %s", wrbuf_buf(wr)); + wrbuf_free(wr, 1); } return apdu; } @@ -1944,7 +2212,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, Z_PresentResponse *resp; int *next; int *num; - int errcode=0; + int errcode = 0; + const char *errstring = 0; yaz_log(log_requestdetail, "Got PresentRequest."); @@ -1979,7 +2248,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, { resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); *resp->presentStatus = Z_PresentStatus_failure; - errcode=bprr->errcode; + errcode = bprr->errcode; + errstring = bprr->errstring; } } apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); @@ -1996,32 +2266,33 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, *num = *req->numberOfRecordsRequested; resp->records = pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, - num, req->recordComposition, next, resp->presentStatus, + num, req->recordComposition, next, + resp->presentStatus, form, req->referenceId, req->preferredRecordSyntax, &errcode); } - if (!resp->records) - return 0; - resp->numberOfRecordsReturned = num; - resp->nextResultSetPosition = next; if (log_request) { - WRBUF wr=wrbuf_alloc(); - wrbuf_printf(wr, "Present: [%s] %d+%d ", - req->resultSetId, *req->resultSetStartPoint, - *req->numberOfRecordsRequested); + WRBUF wr = wrbuf_alloc(); + 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 %d records returned ", *num); + wrbuf_printf(wr, "OK -"); else - wrbuf_printf(wr," Partial (%d) OK %d records returned ", - *resp->presentStatus, *num); + 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); + wrbuf_free(wr, 1); } + if (!resp->records) + return 0; + resp->numberOfRecordsReturned = num; + resp->nextResultSetPosition = next; return apdu; } @@ -2074,9 +2345,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) for (i = 0; i < req->num_databaseNames; i++) yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]); } - yaz_log(log_requestdetail, "pos %d step %d entries %d", - *req->preferredPositionInResponse, *res->stepSize, - *req->numberOfTermsRequested); + bsrr->scanClause = 0; + bsrr->errcode = 0; + bsrr->errstring = 0; bsrr->num_bases = req->num_databaseNames; bsrr->basenames = req->databaseNames; bsrr->num_entries = *req->numberOfTermsRequested; @@ -2086,10 +2357,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) bsrr->print = assoc->print; bsrr->step_size = res->stepSize; bsrr->entries = 0; - /* Note that version 2.0 of YAZ and older did not set entries .. - We do now. And when we do it's easier to extend the scan entry - We know that if the scan handler did set entries, it will - not know of new member display_term. + /* For YAZ 2.0 and earlier it was the backend handler that + initialized entries (member display_term did not exist) + YAZ 2.0 and later sets 'entries' and initialize all members + including 'display_term'. If YAZ 2.0 or later sees that + entries was modified - we assume that it is an old handler and + that 'display_term' is _not_ set. */ if (bsrr->num_entries > 0) { @@ -2122,7 +2395,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) (*assoc->init->bend_scan))(assoc->backend, bsrr); if (bsrr->errcode) - diagrecs_p = diagrecs(assoc, bsrr->errcode, bsrr->errstring); + diagrecs_p = zget_DiagRecs(assoc->encode, + bsrr->errcode, bsrr->errstring); else { int i; @@ -2154,7 +2428,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) if (save_entries == bsrr->entries && bsrr->entries[i].display_term) { - /* the entries was NOT set by the handler. So it's + /* the entries was _not_ set by the handler. So it's safe to test for new member display_term. It is NULL'ed by us. */ @@ -2179,9 +2453,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) } else { - Z_DiagRecs *drecs = diagrecs (assoc, - bsrr->entries[i].errcode, - bsrr->entries[i].errstring); + Z_DiagRecs *drecs = zget_DiagRecs(assoc->encode, + bsrr->entries[i].errcode, + bsrr->entries[i].errstring); assert (drecs->num_diagRecs == 1); e->which = Z_Entry_surrogateDiagnostic; assert (drecs->diagRecs[0]); @@ -2196,23 +2470,24 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) } if (log_request) { - WRBUF wr=wrbuf_alloc(); - wrbuf_printf(wr, "Scan %d@%d ", - *req->preferredPositionInResponse, - *req->numberOfTermsRequested); - if (*res->stepSize) - wrbuf_printf(wr, "(step %d) ",*res->stepSize); + WRBUF wr = wrbuf_alloc(); + if (bsrr->errcode) + wr_diag(wr, bsrr->errcode, bsrr->errstring); + else if (*res->scanStatus == Z_Scan_success) + wrbuf_printf(wr, "OK"); + else + wrbuf_printf(wr, "Partial"); + + wrbuf_printf(wr, " %d+%d %d ", + (req->preferredPositionInResponse ? + *req->preferredPositionInResponse : 1), + *req->numberOfTermsRequested, + (res->stepSize ? *res->stepSize : 0)); wrbuf_scan_term(wr, req->termListAndStartPoint, - bsrr->attributeset); + bsrr->attributeset); - if (*res->scanStatus == Z_Scan_success) - { - wrbuf_printf(wr," OK"); - } - else - wrbuf_printf(wr," Error"); - yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); + yaz_log(log_request, "Scan %s", wrbuf_buf(wr) ); + wrbuf_free(wr, 1); } return apdu; } @@ -2256,7 +2531,8 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, res->resultSetStatus = 0; if (bsrr->errcode) { - Z_DiagRecs *dr = diagrecs (assoc, bsrr->errcode, bsrr->errstring); + Z_DiagRecs *dr = zget_DiagRecs(assoc->encode, + bsrr->errcode, bsrr->errstring); res->diagnostics = dr->diagRecs; res->num_diagnostics = dr->num_diagRecs; } @@ -2272,23 +2548,23 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, apdu->u.sortResponse = res; if (log_request) { - WRBUF wr=wrbuf_alloc(); - wrbuf_printf(wr, "Sort ("); - for (i=0;inum_inputResultSetNames;i++) + WRBUF wr = wrbuf_alloc(); + wrbuf_printf(wr, "Sort "); + if (bsrr->errcode) + wrbuf_printf(wr, " ERROR %d", bsrr->errcode); + else + wrbuf_printf(wr, "OK -"); + wrbuf_printf(wr, " ("); + 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); + wrbuf_printf(wr, ")->%s ",req->sortedResultSetName); - /* FIXME - dump also the sort sequence */ - if (bsrr->errcode) - wrbuf_diags(wr, res->num_diagnostics, res->diagnostics); - else - wrbuf_printf(wr," OK"); yaz_log(log_request, "%s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); + wrbuf_free(wr, 1); } return apdu; } @@ -2309,7 +2585,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, bdrr->num_setnames = req->num_resultSetList; bdrr->setnames = req->resultSetList; - for (i=0;inum_resultSetList;i++) + for (i = 0; inum_resultSetList; i++) yaz_log(log_requestdetail, "resultset: '%s'", req->resultSetList[i]); bdrr->stream = assoc->encode; @@ -2352,7 +2628,6 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, res->deleteListStatuses->elements[i]->status = bdrr->statuses+i; res->deleteListStatuses->elements[i]->id = odr_strdup (assoc->encode, bdrr->setnames[i]); - } } res->numberNotDeleted = 0; @@ -2364,16 +2639,16 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, apdu->u.deleteResultSetResponse = res; if (log_request) { - WRBUF wr=wrbuf_alloc(); + WRBUF wr = wrbuf_alloc(); wrbuf_printf(wr, "Delete "); - for (i=0;inum_resultSetList;i++) - wrbuf_printf(wr, " '%s' ", req->resultSetList[i]); if (bdrr->delete_status) - wrbuf_printf(wr," ERROR %d", bdrr->delete_status); + wrbuf_printf(wr, "ERROR %d", bdrr->delete_status); else - wrbuf_printf(wr,"OK"); + 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); + wrbuf_free(wr, 1); } return apdu; } @@ -2531,9 +2806,9 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) } else { - Z_DiagRecs *diagRecs = diagrecs (assoc, esrequest.errcode, - esrequest.errstring); - + Z_DiagRecs *diagRecs = + 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 !"); *resp->operationStatus = Z_ExtendedServicesResponse_failure; @@ -2541,10 +2816,10 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) resp->diagnostics = diagRecs->diagRecs; if (log_request) { - WRBUF wr=wrbuf_alloc(); + WRBUF wr = wrbuf_alloc(); wrbuf_diags(wr, resp->num_diagnostics, resp->diagnostics); yaz_log(log_request, "EsRequest %s", wrbuf_buf(wr) ); - wrbuf_free(wr,1); + wrbuf_free(wr, 1); } } @@ -2557,3 +2832,11 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) return apdu; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +