X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=55283258cf7c501a48af476a80cabe60d0a735cc;hp=5b2ecf61b0c02f0913ca55042df07ef5e523a9e8;hb=f2b3c045e79a30c889ffdddb408d9d08ab8d7e01;hpb=7a4064cd15f6c6b34c1180e1bc51f0d0e90da320 diff --git a/src/seshigh.c b/src/seshigh.c index 5b2ecf6..5528325 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, 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.113 2007-04-12 13:52:57 adam Exp $ */ /** * \file seshigh.c @@ -76,6 +74,7 @@ #include #include +#include static void process_gdu_request(association *assoc, request *req); static int process_z_request(association *assoc, request *req, char **msg); @@ -94,10 +93,10 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd); static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd); static void process_close(association *assoc, request *reqb); -void save_referenceId (request *reqb, Z_ReferenceId *refid); +void save_referenceId(request *reqb, Z_ReferenceId *refid); static Z_APDU *process_deleteRequest(association *assoc, request *reqb, int *fd); -static Z_APDU *process_segmentRequest (association *assoc, request *reqb); +static Z_APDU *process_segmentRequest(association *assoc, request *reqb); static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd); @@ -225,7 +224,7 @@ void destroy_association(association *h) xmalloc_trav("session closed"); if (cb && cb->one_shot) { - exit (0); + exit(0); } } @@ -394,26 +393,27 @@ void ir_session(IOCHAN h, int event) } if (event & assoc->cs_accept_mask) { - if (!cs_accept (conn)) + if (!cs_accept(conn)) { - yaz_log (YLOG_WARN, "accept failed"); + yaz_log(YLOG_WARN, "accept failed"); destroy_association(assoc); iochan_destroy(h); + return; } - iochan_clearflag (h, EVENT_OUTPUT); + iochan_clearflag(h, EVENT_OUTPUT); if (conn->io_pending) { /* cs_accept didn't complete */ assoc->cs_accept_mask = ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); - iochan_setflag (h, assoc->cs_accept_mask); + iochan_setflag(h, assoc->cs_accept_mask); } else { /* cs_accept completed. Prepare for reading (cs_get) */ assoc->cs_accept_mask = 0; assoc->cs_get_mask = EVENT_INPUT; - iochan_setflag (h, assoc->cs_get_mask); + iochan_setflag(h, assoc->cs_get_mask); } return; } @@ -487,7 +487,7 @@ static int process_z_request(association *assoc, request *req, char **msg); static void assoc_init_reset(association *assoc) { xfree (assoc->init); - assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); + assoc->init = (bend_initrequest *) xmalloc(sizeof(*assoc->init)); assoc->init->stream = assoc->encode; assoc->init->print = assoc->print; @@ -496,6 +496,8 @@ static void assoc_init_reset(association *assoc) assoc->init->implementation_version = 0; assoc->init->implementation_id = 0; assoc->init->implementation_name = 0; + assoc->init->query_charset = 0; + assoc->init->records_in_same_charset = 0; assoc->init->bend_sort = NULL; assoc->init->bend_search = NULL; assoc->init->bend_present = NULL; @@ -513,7 +515,7 @@ 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)); + odr_strdup(assoc->encode, cs_addrstr(assoc->client_link)); yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name); } @@ -532,14 +534,15 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S 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) { @@ -581,7 +584,7 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) #if YAZ_HAVE_XML2 yaz_record_conv_t rc = 0; const char *match_schema = 0; - int *match_syntax = 0; + Odr_oid *match_syntax = 0; if (assoc->server) { @@ -625,7 +628,7 @@ 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; @@ -652,7 +655,7 @@ 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_destroy(output_record); @@ -679,10 +682,8 @@ static int srw_bend_fetch(association *assoc, int pos, rr.setname = "default"; rr.number = pos; rr.referenceId = 0; - rr.request_format = yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_RECSYN, - OID_STR_XML, - assoc->decode); + 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; @@ -735,29 +736,7 @@ static int srw_bend_fetch(association *assoc, int pos, if (rr.errcode && rr.surrogate_flag) { int code = yaz_diag_bib1_to_srw(rr.errcode); - const char *message = yaz_diag_srw_str(code); - int len = 200; - if (message) - len += strlen(message); - if (rr.errstring) - len += strlen(rr.errstring); - - record->recordData_buf = odr_malloc(o, len); - - sprintf(record->recordData_buf, "\n" - " info:srw/diagnostic/1/%d\n", code); - if (rr.errstring) - sprintf(record->recordData_buf + strlen(record->recordData_buf), - "
%s
\n", rr.errstring); - if (message) - sprintf(record->recordData_buf + strlen(record->recordData_buf), - " %s\n", message); - sprintf(record->recordData_buf + strlen(record->recordData_buf), - "\n"); - record->recordData_len = strlen(record->recordData_buf); - record->recordPosition = odr_intdup(o, pos); - record->recordSchema = "info:srw/schema/1/diagnostics-v1.1"; + yaz_mk_sru_surrogate(o, record, pos, code, rr.errstring); return 0; } else if (rr.len >= 0) @@ -765,10 +744,8 @@ 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 ? rr.schema : srw_req->recordSchema); } if (rr.errcode) { @@ -791,8 +768,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, r = cql_parser_string(cp, cql); if (r) { - /* CQL syntax error */ - srw_errcode = 10; + srw_errcode = YAZ_SRW_QUERY_SYNTAX_ERROR; } if (!r) { @@ -801,7 +777,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, cql_parser_result(cp), rpn_buf, sizeof(rpn_buf)-1); if (r) - srw_errcode = cql_transform_error(ct, &add); + srw_errcode = cql_transform_error(ct, &add); } if (!r) { @@ -816,7 +792,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, 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; + srw_errcode = YAZ_SRW_QUERY_SYNTAX_ERROR; } else { @@ -838,19 +814,38 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, if (srw_error) return srw_error; if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101) - return 10; /* bad query type */ + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* bad query type */ rpn = query.u.type_1; if (!rpn->RPNStructure) - return 10; /* must be structure */ + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be structure */ if (rpn->RPNStructure->which != Z_RPNStructure_simple) - return 10; /* must be simple */ + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be simple */ if (rpn->RPNStructure->u.simple->which != Z_Operand_APT) - return 10; /* must be attributes plus term node .. */ + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be be attributes + term */ memcpy(result, rpn->RPNStructure->u.simple->u.attributesPlusTerm, sizeof(*result)); return 0; } + +static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset, + bend_search_rr *bsrr) { + char *ccl0; + struct ccl_rpn_node *node; + int errcode, pos; + + ccl0 = odr_strdupn(odr, (char*) ccl->buf, ccl->len); + if ((node = ccl_find_str(bibset, ccl0, &errcode, &pos)) == 0) { + bsrr->errstring = (char*) ccl_err_msg(errcode); + return YAZ_SRW_QUERY_SYNTAX_ERROR; /* Query syntax error */ + } + + bsrr->query->which = Z_Query_type_1; + bsrr->query->u.type_1 = ccl_rpn_query(odr, node); + return 0; +} + + static void srw_bend_search(association *assoc, request *req, Z_SRW_PDU *sr, Z_SRW_searchRetrieveResponse *srw_res, @@ -876,7 +871,7 @@ static void srw_bend_search(association *assoc, request *req, 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 = (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) @@ -914,15 +909,15 @@ static void srw_bend_search(association *assoc, request *req, Z_RPNQuery *RPNquery; YAZ_PQF_Parser pqf_parser; - pqf_parser = yaz_pqf_create (); + pqf_parser = yaz_pqf_create(); - RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, - srw_req->query.pqf); + 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); + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); yaz_log(log_requestdetail, "Parse error %d %s near offset %ld", code, pqf_msg, (long) off); srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR; @@ -931,7 +926,7 @@ static void srw_bend_search(association *assoc, request *req, rr.query->which = Z_Query_type_1; rr.query->u.type_1 = RPNquery; - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); } else { @@ -965,7 +960,7 @@ static void srw_bend_search(association *assoc, request *req, } else { - srw_error = yaz_diag_bib1_to_srw (rr.errcode); + srw_error = yaz_diag_bib1_to_srw(rr.errcode); yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, @@ -989,12 +984,14 @@ static void srw_bend_search(association *assoc, request *req, odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - if ((rr.hits > 0 && start > rr.hits) || start < 1) + if (start > rr.hits || start < 1) { - yaz_add_srw_diagnostic( - assoc->encode, - &srw_res->diagnostics, &srw_res->num_diagnostics, - YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); + /* 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) { @@ -1007,7 +1004,7 @@ static void srw_bend_search(association *assoc, request *req, if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr*) - odr_malloc (assoc->decode, sizeof(*bprr)); + odr_malloc(assoc->decode, sizeof(*bprr)); bprr->setname = "default"; bprr->start = start; bprr->number = number; @@ -1038,7 +1035,7 @@ static void srw_bend_search(association *assoc, request *req, return; if (bprr->errcode) { - srw_error = yaz_diag_bib1_to_srw (bprr->errcode); + srw_error = yaz_diag_bib1_to_srw(bprr->errcode); yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, @@ -1083,7 +1080,7 @@ static void srw_bend_search(association *assoc, request *req, yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, - yaz_diag_bib1_to_srw (errcode), + yaz_diag_bib1_to_srw(errcode), addinfo); break; @@ -1125,9 +1122,7 @@ static void srw_bend_search(association *assoc, request *req, querystr = srw_req->query.pqf; break; } - wrbuf_printf(wr, "SRWSearch "); - wrbuf_printf(wr, srw_req->database); - wrbuf_printf(wr, " "); + wrbuf_printf(wr, "SRWSearch %s ", srw_req->database); if (srw_res->num_diagnostics) wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri); else if (*http_code != 200) @@ -1151,7 +1146,7 @@ static void srw_bend_search(association *assoc, request *req, static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) { #if YAZ_HAVE_XML2 - xmlNodePtr ptr = rr->server_node_ptr; + xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr; if (!ptr) return 0; for (ptr = ptr->children; ptr; ptr = ptr->next) @@ -1247,7 +1242,7 @@ static void srw_bend_scan(association *assoc, request *req, struct scan_entry *save_entries; bend_scan_rr *bsrr = (bend_scan_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); + odr_malloc(assoc->encode, sizeof(*bsrr)); bsrr->num_bases = 1; bsrr->basenames = &srw_req->database; @@ -1263,12 +1258,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; @@ -1300,7 +1297,8 @@ static void srw_bend_scan(association *assoc, request *req, int srw_error; bsrr->scanClause = 0; bsrr->attributeset = 0; - bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term)); + 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, @@ -1338,7 +1336,7 @@ static void srw_bend_scan(association *assoc, request *req, *http_code = 404; return; } - srw_error = yaz_diag_bib1_to_srw (bsrr->errcode); + srw_error = yaz_diag_bib1_to_srw(bsrr->errcode); yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, @@ -1394,9 +1392,7 @@ static void srw_bend_scan(association *assoc, request *req, querystr = ""; } - wrbuf_printf(wr, "SRWScan "); - wrbuf_printf(wr, srw_req->database); - wrbuf_printf(wr, " "); + wrbuf_printf(wr, "SRWScan %s ", srw_req->database); if (srw_res->num_diagnostics) wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri); @@ -1661,7 +1657,7 @@ static int check_path(const char *path) return 1; } -static char *read_file(const char *fname, ODR o, int *sz) +static char *read_file(const char *fname, ODR o, size_t *sz) { char *buf; FILE *inf = fopen(fname, "rb"); @@ -1671,8 +1667,9 @@ 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); - fread(buf, 1, *sz, inf); + buf = (char *) odr_malloc(o, *sz); + if (fread(buf, 1, *sz, inf) != *sz) + yaz_log(YLOG_WARN|YLOG_ERRNO, "short read %s", fname); fclose(inf); return buf; } @@ -1713,7 +1710,7 @@ static void process_http_request(association *assoc, request *req) } else { - int content_size = 0; + size_t content_size = 0; char *content_buf = read_file(hreq->path+1, o, &content_size); if (!content_buf) { @@ -1775,8 +1772,8 @@ static void process_http_request(association *assoc, request *req) if (sr->which == Z_SRW_searchRetrieve_request) { Z_SRW_PDU *res = - yaz_srw_get(assoc->encode, Z_SRW_searchRetrieve_response); - + yaz_srw_get_pdu(assoc->encode, Z_SRW_searchRetrieve_response, + sr->srw_version); stylesheet = sr->u.request->stylesheet; if (num_diagnostic) { @@ -1793,7 +1790,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) { @@ -1807,7 +1805,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) { @@ -1821,7 +1820,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) { @@ -1852,7 +1852,7 @@ static void process_http_request(association *assoc, request *req) #endif {0, 0, 0} }; - char ctype[60]; + char ctype[80]; int ret; p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; @@ -1870,7 +1870,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); @@ -2008,7 +2008,7 @@ static int process_z_request(association *assoc, request *req, char **msg) case Z_APDU_segmentRequest: if (assoc->init->bend_segment) { - res = process_segmentRequest (assoc, req); + res = process_segmentRequest(assoc, req); } else { @@ -2148,9 +2148,7 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res) static char *get_vhost(Z_OtherInformation *otherInfo) { - const int *oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_USERINFO, OID_STR_PROXY); - return yaz_oi_get_string_oid(&otherInfo, oid, 1, 0); + return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0); } /* @@ -2166,7 +2164,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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 */ @@ -2221,25 +2218,26 @@ 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); } if ((assoc->init->bend_sort)) - yaz_log (YLOG_DEBUG, "Sort handler installed"); + yaz_log(YLOG_DEBUG, "Sort handler installed"); if ((assoc->init->bend_search)) - yaz_log (YLOG_DEBUG, "Search handler installed"); + yaz_log(YLOG_DEBUG, "Search handler installed"); if ((assoc->init->bend_present)) - yaz_log (YLOG_DEBUG, "Present handler installed"); + yaz_log(YLOG_DEBUG, "Present handler installed"); if ((assoc->init->bend_esrequest)) - yaz_log (YLOG_DEBUG, "ESRequest handler installed"); + yaz_log(YLOG_DEBUG, "ESRequest handler installed"); if ((assoc->init->bend_delete)) - yaz_log (YLOG_DEBUG, "Delete handler installed"); + yaz_log(YLOG_DEBUG, "Delete handler installed"); if ((assoc->init->bend_scan)) - yaz_log (YLOG_DEBUG, "Scan handler installed"); + yaz_log(YLOG_DEBUG, "Scan handler installed"); if ((assoc->init->bend_segment)) - yaz_log (YLOG_DEBUG, "Segment handler installed"); + yaz_log(YLOG_DEBUG, "Segment handler installed"); resp->referenceId = req->referenceId; *options = '\0'; @@ -2264,7 +2262,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->bend_esrequest) { ODR_MASK_SET(resp->options, Z_Options_extendedServices); - strcat (options, " extendedServices"); + strcat(options, " extendedServices"); } if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) { @@ -2286,26 +2284,34 @@ 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"); } - if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl)) ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl); @@ -2344,14 +2350,6 @@ 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.113 $"); - if (strlen(version) > 10) /* check for unexpanded CVS strings */ - version[strlen(version)-2] = '\0'; - resp->implementationVersion = odr_prepend(assoc->encode, - assoc->init->implementation_version, - odr_prepend(assoc->encode, &version[11], - resp->implementationVersion)); - if (binitres->errcode) { assoc->state = ASSOC_DEAD; @@ -2431,7 +2429,7 @@ static Z_External *init_diagnostics(ODR odr, int error, const char *addinfo) */ static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec)); + Z_Records *rec = (Z_Records *) odr_malloc(assoc->encode, sizeof(*rec)); yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error), addinfo ? " -- " : "", addinfo ? addinfo : ""); @@ -2458,15 +2456,15 @@ static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, int *next, int *pres, Z_ReferenceId *referenceId, - int *oid, int *errcode) + Odr_oid *oid, int *errcode) { int recno, total_length = 0, toget = *num, dumped_records = 0; Z_Records *records = - (Z_Records *) odr_malloc (a->encode, sizeof(*records)); + (Z_Records *) odr_malloc(a->encode, sizeof(*records)); Z_NamePlusRecordList *reclist = - (Z_NamePlusRecordList *) odr_malloc (a->encode, sizeof(*reclist)); + (Z_NamePlusRecordList *) odr_malloc(a->encode, sizeof(*reclist)); Z_NamePlusRecord **list = - (Z_NamePlusRecord **) odr_malloc (a->encode, sizeof(*list) * toget); + (Z_NamePlusRecord **) odr_malloc(a->encode, sizeof(*list) * toget); records->which = Z_Records_DBOSD; records->u.databaseOrSurDiagnostics = reclist; @@ -2511,11 +2509,9 @@ static Z_Records *pack_records(association *a, char *setname, int start, *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) { - if (!freq.surrogate_flag) + if (!freq.surrogate_flag) /* non-surrogate diagnostic i.e. global */ { char s[20]; *pres = Z_PresentStatus_failure; @@ -2587,10 +2583,7 @@ 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) @@ -2611,7 +2604,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, { Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; bend_search_rr *bsrr = - (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); + (bend_search_rr *)nmem_malloc(reqb->request_mem, sizeof(*bsrr)); yaz_log(log_requestdetail, "Got SearchRequest."); bsrr->fd = fd; @@ -2662,6 +2655,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 */ @@ -2688,10 +2693,10 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, bend_search_rr *bsrt, int *fd) { Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); Z_SearchResponse *resp = (Z_SearchResponse *) - odr_malloc (assoc->encode, sizeof(*resp)); - int *nulint = odr_intdup (assoc->encode, 0); + odr_malloc(assoc->encode, sizeof(*resp)); + int *nulint = odr_intdup(assoc->encode, 0); int *next = odr_intdup(assoc->encode, 0); int *none = odr_intdup(assoc->encode, Z_SearchResponse_none); int returnedrecs = 0; @@ -2723,7 +2728,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, int *toget = odr_intdup(assoc->encode, 0); Z_RecordComposition comp, *compp = 0; - yaz_log (log_requestdetail, "resultCount: %d", bsrt->hits); + yaz_log(log_requestdetail, "resultCount: %d", bsrt->hits); resp->records = 0; resp->resultCount = &bsrt->hits; @@ -2754,7 +2759,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr *) - nmem_malloc (reqb->request_mem, sizeof(*bprr)); + nmem_malloc(reqb->request_mem, sizeof(*bprr)); bprr->setname = req->resultSetName; bprr->start = 1; bprr->number = *toget; @@ -2820,7 +2825,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, for (i = 0 ; i < req->num_databaseNames; i++){ if (i) wrbuf_printf(wr, "+"); - wrbuf_printf(wr, req->databaseNames[i]); + wrbuf_puts(wr, req->databaseNames[i]); } wrbuf_printf(wr, " "); @@ -2866,13 +2871,13 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, yaz_log(log_requestdetail, "Got PresentRequest."); - resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + resp = (Z_PresentResponse *)odr_malloc(assoc->encode, sizeof(*resp)); resp->records = 0; resp->presentStatus = odr_intdup(assoc->encode, 0); if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr *) - nmem_malloc (reqb->request_mem, sizeof(*bprr)); + nmem_malloc(reqb->request_mem, sizeof(*bprr)); bprr->setname = req->resultSetId; bprr->start = *req->resultSetStartPoint; bprr->number = *req->numberOfRecordsRequested; @@ -2897,7 +2902,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, errstring = bprr->errstring; } } - apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); next = odr_intdup(assoc->encode, 0); num = odr_intdup(assoc->encode, 0); @@ -2949,16 +2954,16 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { Z_ScanRequest *req = reqb->apdu_request->u.scanRequest; - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); Z_ScanResponse *res = (Z_ScanResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); int *scanStatus = odr_intdup(assoc->encode, Z_Scan_failure); int *numberOfEntriesReturned = odr_intdup(assoc->encode, 0); Z_ListEntries *ents = (Z_ListEntries *) - odr_malloc (assoc->encode, sizeof(*ents)); + odr_malloc(assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; bend_scan_rr *bsrr = (bend_scan_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); + odr_malloc(assoc->encode, sizeof(*bsrr)); struct scan_entry *save_entries; yaz_log(log_requestdetail, "Got ScanRequest"); @@ -2987,7 +2992,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { int i; for (i = 0; i < req->num_databaseNames; i++) - yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]); + yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]); } bsrr->scanClause = 0; bsrr->errcode = 0; @@ -3000,6 +3005,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) bsrr->stream = assoc->encode; bsrr->print = assoc->print; bsrr->step_size = res->stepSize; + bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, + yaz_oid_userinfo_scan_set, 1, 0); bsrr->entries = 0; /* For YAZ 2.0 and earlier it was the backend handler that initialized entries (member display_term did not exist) @@ -3011,8 +3018,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) if (bsrr->num_entries > 0) { int i; - bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) * - bsrr->num_entries); + bsrr->entries = (struct scan_entry *) + odr_malloc(assoc->decode, sizeof(*bsrr->entries) * + bsrr->num_entries); for (i = 0; inum_entries; i++) { bsrr->entries[i].term = 0; @@ -3025,8 +3033,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) save_entries = bsrr->entries; /* save it so we can compare later */ bsrr->attributeset = req->attributeSet; - log_scan_term_level (log_requestdetail, req->termListAndStartPoint, - bsrr->attributeset); + log_scan_term_level(log_requestdetail, req->termListAndStartPoint, + bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; @@ -3040,7 +3048,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { int i; Z_Entry **tab = (Z_Entry **) - odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries); + odr_malloc(assoc->encode, sizeof(*tab) * bsrr->num_entries); if (bsrr->status == BEND_SCAN_PARTIAL) *scanStatus = Z_Scan_partial_5; @@ -3095,9 +3103,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) Z_DiagRecs *drecs = zget_DiagRecs(assoc->encode, bsrr->entries[i].errcode, bsrr->entries[i].errstring); - assert (drecs->num_diagRecs == 1); + assert(drecs->num_diagRecs == 1); e->which = Z_Entry_surrogateDiagnostic; - assert (drecs->diagRecs[0]); + assert(drecs->diagRecs[0]); e->u.surrogateDiagnostic = drecs->diagRecs[0]; } } @@ -3112,35 +3120,32 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) int i; WRBUF wr = wrbuf_alloc(); wrbuf_printf(wr, "Scan "); - for (i = 0 ; i < req->num_databaseNames; i++){ + for (i = 0 ; i < req->num_databaseNames; i++) + { if (i) wrbuf_printf(wr, "+"); - wrbuf_printf(wr, req->databaseNames[i]); + wrbuf_puts(wr, req->databaseNames[i]); } + wrbuf_printf(wr, " "); - if (bsrr->errcode){ + if (bsrr->errcode) wr_diag(wr, bsrr->errcode, bsrr->errstring); - wrbuf_printf(wr, " "); - } else - wrbuf_printf(wr, "OK "); - /* else if (*res->scanStatus == Z_Scan_success) */ - /* wrbuf_printf(wr, "OK "); */ - /* else */ - /* wrbuf_printf(wr, "Partial "); */ - - if (*res->numberOfEntriesReturned) - wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned); - else - wrbuf_printf(wr, "0 - "); + wrbuf_printf(wr, "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 : 1)); + + if (bsrr->setname) + wrbuf_printf(wr, "+%s", bsrr->setname); + wrbuf_printf(wr, " "); yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, bsrr->attributeset); yaz_log(log_request, "%s", wrbuf_cstr(wr) ); @@ -3155,11 +3160,11 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, int i; Z_SortRequest *req = reqb->apdu_request->u.sortRequest; Z_SortResponse *res = (Z_SortResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); bend_sort_rr *bsrr = (bend_sort_rr *) - odr_malloc (assoc->encode, sizeof(*bsrr)); + odr_malloc(assoc->encode, sizeof(*bsrr)); - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); yaz_log(log_requestdetail, "Got SortRequest."); @@ -3216,7 +3221,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, { if (i) wrbuf_printf(wr, "+"); - wrbuf_printf(wr, req->inputResultSetNames[i]); + wrbuf_puts(wr, req->inputResultSetNames[i]); } wrbuf_printf(wr, ")->%s ",req->sortedResultSetName); @@ -3233,10 +3238,10 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, Z_DeleteResultSetRequest *req = reqb->apdu_request->u.deleteResultSetRequest; Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *) - odr_malloc (assoc->encode, sizeof(*res)); + odr_malloc(assoc->encode, sizeof(*res)); bend_delete_rr *bdrr = (bend_delete_rr *) - odr_malloc (assoc->encode, sizeof(*bdrr)); - Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + odr_malloc(assoc->encode, sizeof(*bdrr)); + Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); yaz_log(log_requestdetail, "Got DeleteRequest."); @@ -3273,18 +3278,18 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, res->deleteListStatuses->num = bdrr->num_setnames; res->deleteListStatuses->elements = (Z_ListStatus **) - odr_malloc (assoc->encode, + odr_malloc(assoc->encode, sizeof(*res->deleteListStatuses->elements) * bdrr->num_setnames); for (i = 0; inum_setnames; i++) { res->deleteListStatuses->elements[i] = (Z_ListStatus *) - odr_malloc (assoc->encode, + odr_malloc(assoc->encode, sizeof(**res->deleteListStatuses->elements)); res->deleteListStatuses->elements[i]->status = bdrr->statuses+i; res->deleteListStatuses->elements[i]->id = - odr_strdup (assoc->encode, bdrr->setnames[i]); + odr_strdup(assoc->encode, bdrr->setnames[i]); } } res->numberNotDeleted = 0; @@ -3337,13 +3342,13 @@ static void process_close(association *assoc, request *reqb) yaz_log(log_request,"Close OK"); } -void save_referenceId (request *reqb, Z_ReferenceId *refid) +void save_referenceId(request *reqb, Z_ReferenceId *refid) { if (refid) { reqb->len_refid = refid->len; - reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len); - memcpy (reqb->refid, refid->buf, refid->len); + reqb->refid = (char *)nmem_malloc(reqb->request_mem, refid->len); + memcpy(reqb->refid, refid->buf, refid->len); } else { @@ -3352,44 +3357,44 @@ void save_referenceId (request *reqb, Z_ReferenceId *refid) } } -void bend_request_send (bend_association a, bend_request req, Z_APDU *res) +void bend_request_send(bend_association a, bend_request req, Z_APDU *res) { - process_z_response (a, req, res); + process_z_response(a, req, res); } -bend_request bend_request_mk (bend_association a) +bend_request bend_request_mk(bend_association a) { - request *nreq = request_get (&a->outgoing); - nreq->request_mem = nmem_create (); + request *nreq = request_get(&a->outgoing); + nreq->request_mem = nmem_create(); return nreq; } -Z_ReferenceId *bend_request_getid (ODR odr, bend_request req) +Z_ReferenceId *bend_request_getid(ODR odr, bend_request req) { Z_ReferenceId *id; if (!req->refid) return 0; - id = (Odr_oct *)odr_malloc (odr, sizeof(*odr)); - id->buf = (unsigned char *)odr_malloc (odr, req->len_refid); + id = (Odr_oct *)odr_malloc(odr, sizeof(*odr)); + id->buf = (unsigned char *)odr_malloc(odr, req->len_refid); id->len = id->size = req->len_refid; - memcpy (id->buf, req->refid, req->len_refid); + memcpy(id->buf, req->refid, req->len_refid); return id; } -void bend_request_destroy (bend_request *req) +void bend_request_destroy(bend_request *req) { nmem_destroy((*req)->request_mem); request_release(*req); *req = NULL; } -int bend_backend_respond (bend_association a, bend_request req) +int bend_backend_respond(bend_association a, bend_request req) { char *msg; int r; - r = process_z_request (a, req, &msg); + r = process_z_request(a, req, &msg); if (r < 0) - yaz_log (YLOG_WARN, "%s", msg); + yaz_log(YLOG_WARN, "%s", msg); return r; } @@ -3403,7 +3408,7 @@ void *bend_request_getdata(bend_request r) return r->clientData; } -static Z_APDU *process_segmentRequest (association *assoc, request *reqb) +static Z_APDU *process_segmentRequest(association *assoc, request *reqb) { bend_segment_rr req; @@ -3499,11 +3504,9 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) /* Do something with the members of bend_extendedservice */ if (esrequest.taskPackage) { - const int *oid = yaz_string_to_oid(yaz_oid_std(), - CLASS_EXTSERV, OID_STR_EXTENDED); - resp->taskPackage = z_ext_record_oid(assoc->encode, oid, - (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;