X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=223239febecc2dc2ed7821663ad8eafefb476b9f;hp=739c998a199c8506a1bd84e37a493a268bbeda58;hb=dbc40ad16aa82379d2884e106d79c7d83312667a;hpb=fc9ad7425061fafd9340229aa006c4db115deee7 diff --git a/src/seshigh.c b/src/seshigh.c index 739c998..223239f 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** @@ -109,10 +109,10 @@ static void get_logbits(void) if (!logbits_set) { logbits_set = 1; - log_session = yaz_log_module_level("session"); + log_session = yaz_log_module_level("session"); log_sessiondetail = yaz_log_module_level("sessiondetail"); log_request = yaz_log_module_level("request"); - log_requestdetail = yaz_log_module_level("requestdetail"); + log_requestdetail = yaz_log_module_level("requestdetail"); } } @@ -125,7 +125,7 @@ static void wr_diag(WRBUF w, int error, const char *addinfo) wrbuf_puts(w, "+"); wrbuf_puts_replace_char(w, addinfo, ' ', '_'); } - wrbuf_puts(w, " "); + wrbuf_puts(w, " "); } static int odr_int_to_int(Odr_int v) @@ -173,7 +173,7 @@ association *create_association(IOCHAN channel, COMSTACK link, if (*apdufile == '@') { odr_setprint(anew->print, yaz_log_file()); - } + } else if (*apdufile != '-') { char filename[256]; @@ -232,7 +232,7 @@ static void do_close_req(association *a, int reason, char *message, { Z_APDU *apdu = zget_APDU(a->encode, Z_APDU_close); Z_Close *cls = apdu->u.close; - + /* Purge request queue */ while (request_deq(&a->incoming)); while (request_deq(&a->outgoing)); @@ -267,14 +267,13 @@ int ir_read(IOCHAN h, int event) association *assoc = (association *)iochan_getdata(h); COMSTACK conn = assoc->client_link; request *req; - + if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask)) { - yaz_log(YLOG_DEBUG, "ir_session (input)"); /* We aren't speaking to this fellow */ if (assoc->state == ASSOC_DEAD) { - yaz_log(log_sessiondetail, "Connection closed - end of session"); + yaz_log(log_session, "Connection closed - end of session"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -291,14 +290,14 @@ int ir_read(IOCHAN h, int event) yaz_log(log_session, "Connection error: %s res=%d", cs_errmsg(cs_errno(conn)), res); req = request_get(&assoc->incoming); /* get a new request */ - do_close_req(assoc, Z_Close_protocolError, + do_close_req(assoc, Z_Close_protocolError, "Incoming package too large", req); return 0; } else if (res <= 0) { - yaz_log(log_session, "Connection closed by client"); assoc->state = ASSOC_DEAD; + yaz_log(log_session, "Connection closed by client"); return 0; } else if (res == 1) /* incomplete read - wait for more */ @@ -339,10 +338,10 @@ int ir_read(IOCHAN h, int event) return 0; } req->request_mem = odr_extract_mem(assoc->decode); - if (assoc->print) + if (assoc->print) { if (!z_GDU(assoc->print, &req->gdu_request, 0, 0)) - yaz_log(YLOG_WARN, "ODR print error: %s", + yaz_log(YLOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } @@ -358,7 +357,7 @@ int ir_read(IOCHAN h, int event) * processing is initiated. Flow of control moves down through the * various process_* functions below, until the encoded result comes back up * to the output handler in here. - * + * * h : the I/O channel that has an outstanding event. * event : the current outstanding event. */ @@ -397,9 +396,9 @@ void ir_session(IOCHAN h, int event) return; } iochan_clearflag(h, EVENT_OUTPUT); - if (conn->io_pending) + if (conn->io_pending) { /* cs_accept didn't complete */ - assoc->cs_accept_mask = + assoc->cs_accept_mask = ((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | ((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); @@ -445,7 +444,6 @@ void ir_session(IOCHAN h, int event) yaz_log(YLOG_DEBUG, "HTTP out:\n%.*s", req->len_response, req->response); #endif - nmem_destroy(req->request_mem); request_deq(&assoc->outgoing); request_release(req); if (!request_head(&assoc->outgoing)) @@ -511,7 +509,7 @@ static void assoc_init_reset(association *assoc) assoc->init->charneg_response = NULL; assoc->init->decode = assoc->decode; - assoc->init->peer_name = + assoc->init->peer_name = odr_strdup(assoc->encode, cs_addrstr(assoc->client_link)); yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name); @@ -528,7 +526,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname); assoc_init_reset(assoc); - + if (sr->username) { Z_IdAuthentication *auth = (Z_IdAuthentication *) @@ -536,10 +534,10 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S size_t len; len = strlen(sr->username) + 1; - if (sr->password) + if (sr->password) len += strlen(sr->password) + 2; yaz_log(log_requestdetail, "username=%s password-len=%ld", - sr->username, (long) + sr->username, (long) (sr->password ? strlen(sr->password) : 0)); auth->which = Z_IdAuthentication_open; auth->u.open = (char *) odr_malloc(assoc->decode, len); @@ -591,7 +589,7 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) int r; const char *input_schema = yaz_get_esn(rr->comp); Odr_oid *input_syntax_raw = rr->request_format; - + const char *backend_schema = 0; Odr_oid *backend_syntax = 0; @@ -673,7 +671,7 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) static int srw_bend_fetch(association *assoc, int pos, Z_SRW_searchRetrieveRequest *srw_req, Z_SRW_record *record, - const char **addinfo) + const char **addinfo, int *last_in_set) { bend_fetch_rr rr; ODR o = assoc->encode; @@ -690,13 +688,13 @@ static int srw_bend_fetch(association *assoc, int pos, odr_malloc(assoc->decode, sizeof(Z_CompSpec)); rr.comp->u.complex->selectAlternativeSyntax = (bool_t *) odr_malloc(assoc->encode, sizeof(bool_t)); - *rr.comp->u.complex->selectAlternativeSyntax = 0; + *rr.comp->u.complex->selectAlternativeSyntax = 0; rr.comp->u.complex->num_dbSpecific = 0; rr.comp->u.complex->dbSpecific = 0; - rr.comp->u.complex->num_recordSyntax = 0; + rr.comp->u.complex->num_recordSyntax = 0; rr.comp->u.complex->recordSyntax = 0; - rr.comp->u.complex->generic = (Z_Specification *) + rr.comp->u.complex->generic = (Z_Specification *) odr_malloc(assoc->decode, sizeof(Z_Specification)); /* schema uri = recordSchema (or NULL if recordSchema is not given) */ @@ -707,14 +705,14 @@ static int srw_bend_fetch(association *assoc, int pos, rr.comp->u.complex->generic->elementSpec = 0; if (srw_req->recordSchema) { - rr.comp->u.complex->generic->elementSpec = + rr.comp->u.complex->generic->elementSpec = (Z_ElementSpec *) odr_malloc(assoc->encode, sizeof(Z_ElementSpec)); - rr.comp->u.complex->generic->elementSpec->which = + rr.comp->u.complex->generic->elementSpec->which = Z_ElementSpec_elementSetName; rr.comp->u.complex->generic->elementSpec->u.elementSetName = srw_req->recordSchema; } - + rr.stream = assoc->encode; rr.print = assoc->print; @@ -732,6 +730,8 @@ static int srw_bend_fetch(association *assoc, int pos, retrieve_fetch(assoc, &rr); + *last_in_set = rr.last_in_set; + if (rr.errcode && rr.surrogate_flag) { int code = yaz_diag_bib1_to_srw(rr.errcode); @@ -762,8 +762,8 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, int r; int srw_errcode = 0; const char *add = 0; - char rpn_buf[5120]; - + WRBUF rpn_buf = wrbuf_alloc(); + *sortkeys_p = 0; r = cql_parser_string(cp, cql); if (r) @@ -775,18 +775,18 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, struct cql_node *cn = cql_parser_result(cp); /* Syntax OK */ - r = cql_transform_buf(ct, cn, rpn_buf, sizeof(rpn_buf)-1); + r = cql_transform(ct, cn, wrbuf_vp_puts, rpn_buf); if (r) srw_errcode = cql_transform_error(ct, &add); else { char out[100]; int r = cql_sortby_to_sortkeys_buf(cn, out, sizeof(out)-1); - + if (r == 0) { if (*out) - yaz_log (log_requestdetail, "srw_sortKeys '%s'", out); + yaz_log(log_requestdetail, "srw_sortKeys '%s'", out); *sortkeys_p = odr_strdup(odr, out); } else @@ -801,7 +801,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, /* 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); + Z_RPNQuery *rpnquery = yaz_pqf_parse(pp, odr, wrbuf_cstr(rpn_buf)); if (!rpnquery) { size_t off; @@ -819,6 +819,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, yaz_pqf_destroy(pp); } cql_parser_destroy(cp); + wrbuf_destroy(rpn_buf); return srw_errcode; } @@ -834,7 +835,7 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101) return YAZ_SRW_QUERY_SYNTAX_ERROR; /* bad query type */ rpn = query.u.type_1; - if (!rpn->RPNStructure) + if (!rpn->RPNStructure) return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be structure */ if (rpn->RPNStructure->which != Z_RPNStructure_simple) return YAZ_SRW_QUERY_SYNTAX_ERROR; /* must be simple */ @@ -844,7 +845,7 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, sizeof(*result)); return 0; } - + static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset, bend_search_rr *bsrr) @@ -874,7 +875,7 @@ static void srw_bend_search(association *assoc, int srw_error = 0; Z_External *ext; Z_SRW_searchRetrieveRequest *srw_req = sr->u.request; - + *http_code = 200; yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest"); srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); @@ -895,7 +896,9 @@ static void srw_bend_search(association *assoc, rr.query->u.type_1 = 0; rr.extra_args = sr->extra_args; rr.extra_response_data = 0; - + rr.present_number = srw_req->maximumRecords ? + *srw_req->maximumRecords : 0; + if (srw_req->query_type == Z_SRW_query_type_cql) { if (assoc->server && assoc->server->cql_transform) @@ -917,13 +920,13 @@ static void srw_bend_search(association *assoc, { /* 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, + 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; } @@ -932,9 +935,9 @@ static void srw_bend_search(association *assoc, { 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) @@ -946,10 +949,10 @@ static void srw_bend_search(association *assoc, code, pqf_msg, (long) off); srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR; } - + rr.query->which = Z_Query_type_1; rr.query->u.type_1 = RPNquery; - + yaz_pqf_destroy(pqf_parser); } else @@ -964,7 +967,7 @@ static void srw_bend_search(association *assoc, rr.decode = assoc->decode; rr.print = assoc->print; if (srw_req->sort.sortKeys) - rr.srw_sortKeys = odr_strdup(assoc->encode, + rr.srw_sortKeys = odr_strdup(assoc->encode, srw_req->sort.sortKeys); rr.association = assoc; rr.hits = 0; @@ -973,7 +976,7 @@ static void srw_bend_search(association *assoc, rr.search_info = 0; rr.search_input = 0; yaz_log_zquery_level(log_requestdetail,rr.query); - + (assoc->init->bend_search)(assoc->backend, &rr); if (rr.errcode) { @@ -996,11 +999,11 @@ static void srw_bend_search(association *assoc, odr_int_to_int(*srw_req->maximumRecords) : 0; int start = srw_req->startRecord ? odr_int_to_int(*srw_req->startRecord) : 1; - + yaz_log(log_requestdetail, "Request to pack %d+%d out of " ODR_INT_PRINTF, start, number, rr.hits); - + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); if (rr.srw_setname) { @@ -1009,13 +1012,13 @@ static void srw_bend_search(association *assoc, srw_res->resultSetIdleTime = odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } - + if (start > rr.hits || start < 1) { /* if hits<=0 and start=1 we don't return a diagnostic */ if (start != 1) yaz_add_srw_diagnostic( - assoc->encode, + assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0); } @@ -1025,7 +1028,7 @@ static void srw_bend_search(association *assoc, int ok = 1; if (start + number > rr.hits) number = odr_int_to_int(rr.hits) - start + 1; - + /* Call bend_present if defined */ if (assoc->init->bend_present) { @@ -1055,7 +1058,7 @@ static void srw_bend_search(association *assoc, bprr->errcode = 0; bprr->errstring = NULL; (*assoc->init->bend_present)(assoc->backend, bprr); - + if (bprr->errcode) { srw_error = yaz_diag_bib1_to_srw(bprr->errcode); @@ -1066,14 +1069,14 @@ static void srw_bend_search(association *assoc, ok = 0; } } - + if (ok) { int j = 0; int packing = Z_SRW_recordPacking_string; if (srw_req->recordPacking) { - packing = + packing = yaz_srw_str_to_pack(srw_req->recordPacking); if (packing == -1) packing = Z_SRW_recordPacking_string; @@ -1081,7 +1084,7 @@ static void srw_bend_search(association *assoc, srw_res->records = (Z_SRW_record *) odr_malloc(assoc->encode, number * sizeof(*srw_res->records)); - + srw_res->extra_records = (Z_SRW_extra_record **) odr_malloc(assoc->encode, number*sizeof(*srw_res->extra_records)); @@ -1089,15 +1092,16 @@ static void srw_bend_search(association *assoc, for (i = 0; irecords[j].recordPacking = packing; srw_res->records[j].recordData_buf = 0; srw_res->extra_records[j] = 0; yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start); errcode = srw_bend_fetch(assoc, i+start, srw_req, srw_res->records + j, - &addinfo); + &addinfo, &last_in_set); if (errcode) { yaz_add_srw_diagnostic(assoc->encode, @@ -1105,11 +1109,13 @@ static void srw_bend_search(association *assoc, &srw_res->num_diagnostics, yaz_diag_bib1_to_srw(errcode), addinfo); - + break; } if (srw_res->records[j].recordData_buf) j++; + if (last_in_set) + break; } srw_res->num_records = j; if (!j) @@ -1161,10 +1167,10 @@ static void srw_bend_search(association *assoc, (srw_res->numberOfRecords ? *srw_res->numberOfRecords : 0)); } - wrbuf_printf(wr, " %s " ODR_INT_PRINTF "+%d", + wrbuf_printf(wr, " %s " ODR_INT_PRINTF "+%d", (srw_res->resultSetId ? srw_res->resultSetId : "-"), - (srw_req->startRecord ? *srw_req->startRecord : 1), + (srw_req->startRecord ? *srw_req->startRecord : 1), srw_res->num_records); yaz_log(log_request, "%s %s: %s", wrbuf_cstr(wr), querytype, querystr); wrbuf_destroy(wr); @@ -1189,14 +1195,14 @@ static char *srw_bend_explain_default(bend_explain_rr *rr) 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; @@ -1219,7 +1225,7 @@ static void srw_bend_explain(association *assoc, if (assoc->init) { bend_explain_rr rr; - + rr.stream = assoc->encode; rr.decode = assoc->decode; rr.print = assoc->print; @@ -1240,7 +1246,7 @@ static void srw_bend_explain(association *assoc, int packing = Z_SRW_recordPacking_string; if (srw_req->recordPacking) { - packing = + packing = yaz_srw_str_to_pack(srw_req->recordPacking); if (packing == -1) packing = Z_SRW_recordPacking_string; @@ -1289,10 +1295,10 @@ static void srw_bend_scan(association *assoc, bsrr->entries = 0; bsrr->setname = 0; - if (bsrr->num_entries > 0) + if (bsrr->num_entries > 0) { int i; - bsrr->entries = (struct scan_entry *) + bsrr->entries = (struct scan_entry *) odr_malloc(assoc->decode, sizeof(*bsrr->entries) * bsrr->num_entries); for (i = 0; inum_entries; i++) @@ -1310,10 +1316,10 @@ static void srw_bend_scan(association *assoc, assoc->init->bend_scan) { YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); - + bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode, - &bsrr->attributeset, - srw_req->scanClause.pqf); + &bsrr->attributeset, + srw_req->scanClause.pqf); yaz_pqf_destroy(pqf_parser); bsrr->scanClause = 0; ((int (*)(void *, bend_scan_rr *)) @@ -1386,14 +1392,14 @@ static void srw_bend_scan(association *assoc, t->numberOfRecords = odr_intdup(assoc->encode, bsrr->entries[i].occurrences); t->displayTerm = 0; - if (save_entries == bsrr->entries && + 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, + t->displayTerm = odr_strdup(assoc->encode, bsrr->entries[i].display_term); } t->whereInList = 0; @@ -1431,7 +1437,7 @@ static void srw_bend_scan(association *assoc, wrbuf_printf(wr, "OK - - "); wrbuf_printf(wr, ODR_INT_PRINTF "+" ODR_INT_PRINTF " ", - (srw_req->responsePosition ? + (srw_req->responsePosition ? *srw_req->responsePosition : 1), (srw_req->maximumTerms ? *srw_req->maximumTerms : 1)); @@ -1457,7 +1463,7 @@ static void srw_bend_update(association *assoc, { bend_update_rr rr; Z_SRW_extra_record *extra = srw_req->extra_record; - + rr.stream = assoc->encode; rr.print = assoc->print; rr.num_bases = 1; @@ -1476,7 +1482,7 @@ static void srw_bend_update(association *assoc, rr.uri = 0; rr.message = 0; rr.details = 0; - + *http_code = 200; if (rr.operation == 0) { @@ -1500,14 +1506,14 @@ static void srw_bend_update(association *assoc, if (srw_req->record) { rr.record_data = odr_strdupn( - assoc->encode, + assoc->encode, srw_req->record->recordData_buf, srw_req->record->recordData_len ); } if (extra && extra->extraRecordData_len) { rr.extra_record_data = odr_strdupn( - assoc->encode, + assoc->encode, extra->extraRecordData_buf, extra->extraRecordData_len ); } @@ -1522,7 +1528,7 @@ static void srw_bend_update(association *assoc, rr.record_id = srw_req->recordId; else if (extra && extra->recordIdentifier) rr.record_id = extra->recordIdentifier; - else + else { yaz_add_sru_update_diagnostic( assoc->encode, &srw_res->diagnostics, @@ -1538,30 +1544,30 @@ static void srw_bend_update(association *assoc, YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, "record"); } - else + else { if (srw_req->record->recordSchema) rr.record_schema = odr_strdup( assoc->encode, srw_req->record->recordSchema); if (srw_req->record->recordData_len ) { - rr.record_data = odr_strdupn(assoc->encode, + rr.record_data = odr_strdupn(assoc->encode, srw_req->record->recordData_buf, srw_req->record->recordData_len ); } - else + else { yaz_add_sru_update_diagnostic( assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, - YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, + YAZ_SRU_UPDATE_MISSING_MANDATORY_ELEMENT_RECORD_REJECTED, "recordData" ); } } if (extra && extra->extraRecordData_len) { rr.extra_record_data = odr_strdupn( - assoc->encode, + assoc->encode, extra->extraRecordData_buf, extra->extraRecordData_len ); } @@ -1569,31 +1575,31 @@ static void srw_bend_update(association *assoc, else if (!strcmp(rr.operation, "insert")) { if (srw_req->recordId) - rr.record_id = srw_req->recordId; + rr.record_id = srw_req->recordId; else if (extra) rr.record_id = extra->recordIdentifier; - + if (srw_req->record) { if (srw_req->record->recordSchema) rr.record_schema = odr_strdup( assoc->encode, srw_req->record->recordSchema); - + if (srw_req->record->recordData_len) rr.record_data = odr_strdupn( - assoc->encode, + assoc->encode, srw_req->record->recordData_buf, srw_req->record->recordData_len ); } if (extra && extra->extraRecordData_len) { rr.extra_record_data = odr_strdupn( - assoc->encode, + assoc->encode, extra->extraRecordData_buf, extra->extraRecordData_len ); } } - else + else yaz_add_sru_update_diagnostic(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, YAZ_SRU_UPDATE_INVALID_ACTION, @@ -1601,7 +1607,7 @@ static void srw_bend_update(association *assoc, if (srw_req->record) { - const char *pack_str = + const char *pack_str = yaz_srw_pack_to_str(srw_req->record->recordPacking); if (pack_str) rr.record_packing = odr_strdup(assoc->encode, pack_str); @@ -1622,7 +1628,7 @@ static void srw_bend_update(association *assoc, { if ( assoc->init->bend_srw_update) (*assoc->init->bend_srw_update)(assoc->backend, &rr); - else + else yaz_add_sru_update_diagnostic( assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, @@ -1634,7 +1640,7 @@ static void srw_bend_update(association *assoc, yaz_add_srw_diagnostic_uri(assoc->encode, &srw_res->diagnostics, &srw_res->num_diagnostics, - rr.uri, + rr.uri, rr.message, rr.details); srw_res->recordId = rr.record_id; @@ -1666,7 +1672,7 @@ static void srw_bend_update(association *assoc, srw_res->record->recordData_len = strlen(rr.record_data); if (rr.extra_record_data) { - Z_SRW_extra_record *ex = + Z_SRW_extra_record *ex = yaz_srw_get_extra_record(assoc->encode); srw_res->extra_record = ex; ex->extraRecordData_buf = rr.extra_record_data; @@ -1700,7 +1706,7 @@ static char *read_file(const char *fname, ODR o, size_t *sz) if (fread(buf, 1, *sz, inf) != *sz) yaz_log(YLOG_WARN|YLOG_ERRNO, "short read %s", fname); fclose(inf); - return buf; + return buf; } static void process_http_request(association *assoc, request *req) @@ -1726,13 +1732,13 @@ static void process_http_request(association *assoc, request *req) r = 1; } if (r == 2 && assoc->server && assoc->server->docpath - && hreq->path[0] == '/' - && + && hreq->path[0] == '/' + && /* check if path is a proper prefix of documentroot */ strncmp(hreq->path+1, assoc->server->docpath, strlen(assoc->server->docpath)) == 0) - { + { if (!check_path(hreq->path)) { yaz_log(YLOG_LOG, "File %s access forbidden", hreq->path+1); @@ -1751,7 +1757,7 @@ static void process_http_request(association *assoc, request *req) { const char *ctype = 0; yaz_mime_types types = yaz_mime_types_create(); - + yaz_mime_types_add(types, "xsl", "application/xml"); yaz_mime_types_add(types, "xml", "application/xml"); yaz_mime_types_add(types, "css", "text/css"); @@ -1759,12 +1765,12 @@ static void process_http_request(association *assoc, request *req) yaz_mime_types_add(types, "htm", "text/html"); yaz_mime_types_add(types, "txt", "text/plain"); yaz_mime_types_add(types, "js", "application/x-javascript"); - + yaz_mime_types_add(types, "gif", "image/gif"); yaz_mime_types_add(types, "png", "image/png"); yaz_mime_types_add(types, "jpg", "image/jpeg"); yaz_mime_types_add(types, "jpeg", "image/jpeg"); - + ctype = yaz_mime_lookup_fname(types, hreq->path); if (!ctype) { @@ -1823,7 +1829,7 @@ static void process_http_request(association *assoc, request *req) sr->srw_version); stylesheet = sr->u.explain_request->stylesheet; if (num_diagnostic) - { + { res->u.explain_response->diagnostics = diagnostic; res->u.explain_response->num_diagnostics = num_diagnostic; } @@ -1837,7 +1843,7 @@ static void process_http_request(association *assoc, request *req) sr->srw_version); stylesheet = sr->u.scan_request->stylesheet; if (num_diagnostic) - { + { res->u.scan_response->diagnostics = diagnostic; res->u.scan_response->num_diagnostics = num_diagnostic; } @@ -1851,7 +1857,7 @@ static void process_http_request(association *assoc, request *req) sr->srw_version); yaz_log(YLOG_DEBUG, "handling SRW UpdateRequest"); if (num_diagnostic) - { + { res->u.update_response->diagnostics = diagnostic; res->u.update_response->num_diagnostics = num_diagnostic; } @@ -1862,11 +1868,11 @@ static void process_http_request(association *assoc, request *req) } else { - yaz_log(log_request, "SOAP ERROR"); + yaz_log(log_request, "SOAP ERROR"); /* FIXME - what error, what query */ http_code = 500; z_soap_error(assoc->encode, soap_package, - "SOAP-ENV:Client", "Bad method", 0); + "SOAP-ENV:Client", "Bad method", 0); } if (http_code == 200 || http_code == 500) { @@ -1879,7 +1885,6 @@ static void process_http_request(association *assoc, request *req) {0, 0, 0} }; char ctype[80]; - int ret; p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; @@ -1890,9 +1895,9 @@ static void process_http_request(association *assoc, request *req) if (stylesheet && *stylesheet == '\0') stylesheet = 0; - ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers, charset, stylesheet); + z_soap_codec_enc_xsl(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset, stylesheet); hres->code = http_code; strcpy(ctype, "text/xml"); @@ -1910,7 +1915,7 @@ static void process_http_request(association *assoc, request *req) if (p == 0) p = z_get_HTTP_Response(o, 500); hres = p->u.HTTP_Response; - if (!strcmp(hreq->version, "1.0")) + if (!strcmp(hreq->version, "1.0")) { const char *v = z_HTTP_header_lookup(hreq->headers, "Connection"); if (v && !strcmp(v, "Keep-Alive")) @@ -1975,7 +1980,7 @@ static int process_z_request(association *assoc, request *req, char **msg) { Z_APDU *res; int retval; - + *msg = "Unknown Error"; assert(req && req->state == REQUEST_IDLE); if (req->apdu_request->which != Z_APDU_initRequest && !assoc->init) @@ -2070,7 +2075,7 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) if (assoc->print) { if (!z_GDU(assoc->print, &res, 0, 0)) - yaz_log(YLOG_WARN, "ODR print error: %s", + yaz_log(YLOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } @@ -2154,7 +2159,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (req->implementationVersion) yaz_log(log_requestdetail, "Version: %s", req->implementationVersion); - + assoc_init_reset(assoc); assoc->init->auth = req->idAuthentication; @@ -2179,9 +2184,9 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (req->implementationVersion) yaz_log(log_requestdetail, "Config: %s", cb->configname); - + iochan_settimeout(assoc->client_chan, cb->idle_timeout); - + /* we have a backend control block, so call that init function */ if (!(binitres = (*cb->bend_init)(assoc->init))) { @@ -2204,16 +2209,16 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if ((assoc->init->bend_search)) 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'; /* let's tell the client what we can do */ @@ -2260,7 +2265,7 @@ 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)) { Z_OtherInformationUnit *p0; @@ -2270,7 +2275,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (assoc->init->query_charset) { assoc->init->charneg_response = yaz_set_response_charneg( - assoc->encode, assoc->init->query_charset, 0, + assoc->encode, assoc->init->query_charset, 0, assoc->init->records_in_same_charset); } else @@ -2317,13 +2322,17 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) resp->preferredMessageSize = odr_intdup(assoc->encode, assoc->preferredMessageSize); - resp->maximumRecordSize = + resp->maximumRecordSize = odr_intdup(assoc->encode, assoc->maximumRecordSize); resp->implementationId = odr_prepend(assoc->encode, assoc->init->implementation_id, resp->implementationId); + resp->implementationVersion = odr_prepend(assoc->encode, + assoc->init->implementation_version, + resp->implementationVersion); + resp->implementationName = odr_prepend(assoc->encode, assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); @@ -2338,7 +2347,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } else assoc->state = ASSOC_UP; - + if (log_request) { if (!req->idAuthentication) @@ -2361,7 +2370,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) yaz_log(log_request, "Auth idPass %s %s", user ? user : "-", group ? group : "-"); } - else if (req->idAuthentication->which + else if (req->idAuthentication->which == Z_IdAuthentication_anonymous) { yaz_log(log_request, "Auth anonymous"); @@ -2380,7 +2389,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) else wrbuf_printf(wr, "OK -"); wrbuf_printf(wr, " ID:%s Name:%s Version:%s", - (req->implementationId ? req->implementationId :"-"), + (req->implementationId ? req->implementationId :"-"), (req->implementationName ? req->implementationName : "-"), (req->implementationVersion ? @@ -2424,7 +2433,7 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) /* * surrogate diagnostic. */ -static Z_NamePlusRecord *surrogatediagrec(association *assoc, +static Z_NamePlusRecord *surrogatediagrec(association *assoc, const char *dbname, int error, const char *addinfo) { @@ -2505,7 +2514,7 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, *pres = Z_PresentStatus_failure; /* for 'present request out of range', set addinfo to record position if not set */ - if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE && + if (freq.errcode == YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE && freq.errstring == 0) { sprintf(s, "%d", recno); @@ -2593,6 +2602,8 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, return 0; reclist->records[reclist->num_records] = thisrec; reclist->num_records++; + if (freq.last_in_set) + break; } *num = reclist->num_records; return records; @@ -2601,9 +2612,9 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, static Z_APDU *process_searchRequest(association *assoc, request *reqb) { Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; - bend_search_rr *bsrr = + bend_search_rr *bsrr = (bend_search_rr *)nmem_malloc(reqb->request_mem, sizeof(*bsrr)); - + yaz_log(log_requestdetail, "Got SearchRequest."); bsrr->association = assoc; bsrr->referenceId = req->referenceId; @@ -2615,7 +2626,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->extra_args = 0; bsrr->extra_response_data = 0; - yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName); + yaz_log(log_requestdetail, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) { int i; @@ -2641,13 +2652,14 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->errstring = NULL; bsrr->search_info = NULL; bsrr->search_input = req->otherInfo; + bsrr->present_number = *req->mediumSetPresentNumber; - if (assoc->server && assoc->server->cql_transform + if (assoc->server && assoc->server->cql_transform && req->query->which == Z_Query_type_104 && req->query->u.type_104->which == Z_External_CQL) { /* have a CQL query and a CQL to PQF transform .. */ - int srw_errcode = + int srw_errcode = cql2pqf(bsrr->stream, req->query->u.type_104->u.cql, assoc->server->cql_transform, bsrr->query, &bsrr->srw_sortKeys); @@ -2655,11 +2667,11 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); } - if (assoc->server && assoc->server->ccl_transform + 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 = + int srw_errcode = ccl2pqf(bsrr->stream, req->query->u.type_2, assoc->server->ccl_transform, bsrr); if (srw_errcode) @@ -2670,7 +2682,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) (assoc->init->bend_search)(assoc->backend, bsrr); } else - { + { /* FIXME - make a diagnostic for it */ yaz_log(YLOG_WARN,"Search not supported ?!?!"); } @@ -2799,12 +2811,12 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, resp->resultSetStatus = 0; if (bsrt->estimated_hit_count) { - resp->resultSetStatus = odr_intdup(assoc->encode, + resp->resultSetStatus = odr_intdup(assoc->encode, Z_SearchResponse_estimate); } else if (bsrt->partial_resultset) { - resp->resultSetStatus = odr_intdup(assoc->encode, + resp->resultSetStatus = odr_intdup(assoc->encode, Z_SearchResponse_subset); } } @@ -2822,7 +2834,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, wrbuf_puts(wr, req->databaseNames[i]); } wrbuf_printf(wr, " "); - + if (bsrt->errcode) wrbuf_printf(wr, "ERROR %d", bsrt->errcode); else @@ -2830,7 +2842,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, wrbuf_printf(wr, " %s 1+" ODR_INT_PRINTF " ", req->resultSetName, returnedrecs); yaz_query_to_wrbuf(wr, req->query); - + yaz_log(log_request, "Search %s", wrbuf_cstr(wr)); wrbuf_destroy(wr); } @@ -2860,7 +2872,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) Odr_int *next; Odr_int *num; int errcode = 0; - const char *errstring = 0; yaz_log(log_requestdetail, "Got PresentRequest."); @@ -2883,24 +2894,23 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) bprr->errcode = 0; bprr->errstring = NULL; (*assoc->init->bend_present)(assoc->backend, bprr); - + if (bprr->errcode) { resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); *resp->presentStatus = Z_PresentStatus_failure; errcode = bprr->errcode; - errstring = bprr->errstring; } } apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); next = odr_intdup(assoc->encode, 0); num = odr_intdup(assoc->encode, 0); - + apdu->which = Z_APDU_presentResponse; apdu->u.presentResponse = resp; resp->referenceId = req->referenceId; resp->otherInfo = 0; - + if (!resp->records) { *num = *req->numberOfRecordsRequested; @@ -2908,7 +2918,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, num, req->recordComposition, next, resp->presentStatus, - req->referenceId, req->preferredRecordSyntax, + req->referenceId, req->preferredRecordSyntax, &errcode); } if (log_request) @@ -2934,7 +2944,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) return 0; resp->numberOfRecordsReturned = num; resp->nextResultSetPosition = next; - + return apdu; } @@ -2997,7 +3007,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) bsrr->stream = assoc->encode; bsrr->print = assoc->print; bsrr->step_size = &step_size; - bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, + 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 @@ -3007,7 +3017,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) entries was modified - we assume that it is an old handler and that 'display_term' is _not_ set. */ - if (bsrr->num_entries > 0) + if (bsrr->num_entries > 0) { int i; bsrr->entries = (struct scan_entry *) @@ -3025,7 +3035,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) save_entries = bsrr->entries; /* save it so we can compare later */ bsrr->attributeset = req->attributeSet; - log_scan_term_level(log_requestdetail, req->termListAndStartPoint, + log_scan_term_level(log_requestdetail, req->termListAndStartPoint, bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? odr_int_to_int(*req->preferredPositionInResponse) : 1; @@ -3041,7 +3051,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) int i; Z_Entry **tab = (Z_Entry **) odr_malloc(assoc->encode, sizeof(*tab) * bsrr->num_entries); - + if (bsrr->status == BEND_SCAN_PARTIAL) *scanStatus = Z_Scan_partial_5; else @@ -3049,7 +3059,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) res->stepSize = odr_intdup(assoc->encode, step_size); ents->entries = tab; ents->num_entries = bsrr->num_entries; - res->numberOfEntriesReturned = odr_intdup(assoc->encode, + res->numberOfEntriesReturned = odr_intdup(assoc->encode, ents->num_entries); res->positionOfTerm = odr_intdup(assoc->encode, bsrr->term_position); for (i = 0; i < bsrr->num_entries; i++) @@ -3057,7 +3067,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) Z_Entry *e; Z_TermInfo *t; Odr_oct *o; - + tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); if (bsrr->entries[i].occurrences >= 0) { @@ -3066,7 +3076,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) odr_malloc(assoc->encode, sizeof(*t)); t->suggestedAttributes = 0; t->displayTerm = 0; - if (save_entries == bsrr->entries && + if (save_entries == bsrr->entries && bsrr->entries[i].display_term) { /* the entries was _not_ set by the handler. So it's @@ -3122,13 +3132,13 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) } wrbuf_printf(wr, " "); - + if (bsrr->errcode) wr_diag(wr, bsrr->errcode, bsrr->errstring); else - wrbuf_printf(wr, "OK"); + wrbuf_printf(wr, "OK"); - wrbuf_printf(wr, " " ODR_INT_PRINTF " - " ODR_INT_PRINTF "+" + wrbuf_printf(wr, " " ODR_INT_PRINTF " - " ODR_INT_PRINTF "+" ODR_INT_PRINTF "+" ODR_INT_PRINTF, res->numberOfEntriesReturned ? *res->numberOfEntriesReturned : 0, @@ -3136,12 +3146,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) *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, + yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, bsrr->attributeset); yaz_log(log_request, "%s", wrbuf_cstr(wr) ); wrbuf_destroy(wr); @@ -3179,9 +3189,9 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb) bsrr->sort_status = Z_SortResponse_failure; bsrr->errcode = 0; bsrr->errstring = 0; - + (*assoc->init->bend_sort)(assoc->backend, bsrr); - + res->referenceId = bsrr->referenceId; res->sortStatus = odr_intdup(assoc->encode, bsrr->sort_status); res->resultSetStatus = 0; @@ -3250,14 +3260,14 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb) bdrr->statuses = 0; if (bdrr->num_setnames > 0) { - bdrr->statuses = (int*) + bdrr->statuses = (int*) odr_malloc(assoc->encode, sizeof(*bdrr->statuses) * bdrr->num_setnames); for (i = 0; i < bdrr->num_setnames; i++) bdrr->statuses[i] = 0; } (*assoc->init->bend_delete)(assoc->backend, bdrr); - + res->referenceId = req->referenceId; res->deleteOperationStatus = odr_intdup(assoc->encode,bdrr->delete_status); @@ -3271,7 +3281,7 @@ 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++) @@ -3345,7 +3355,7 @@ static Z_APDU *process_segmentRequest(association *assoc, request *reqb) req.decode = assoc->decode; req.print = assoc->print; req.association = assoc; - + (*assoc->init->bend_segment)(assoc->backend, &req); return 0; @@ -3371,7 +3381,7 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb) esrequest.association = assoc; esrequest.taskPackage = 0; esrequest.referenceId = req->referenceId; - + if (esrequest.esr && esrequest.esr->taskSpecificParameters) { switch(esrequest.esr->taskSpecificParameters->which) @@ -3389,7 +3399,7 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb) } (*assoc->init->bend_esrequest)(assoc->backend, &esrequest); - + resp->referenceId = req->referenceId; if (esrequest.errcode == -1)