X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=2ef4ad5ee2437996c3f430701c18a6211b8b6c3a;hp=30bf9e29be5ab7a552f3759c846b164bf578977f;hb=f0df1959fda559c0d952810c338a9fde667b5a63;hpb=1331fd610a8bfc1e5a849d2c4d598c11557a8372 diff --git a/src/seshigh.c b/src/seshigh.c index 30bf9e2..2ef4ad5 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -56,6 +56,7 @@ #include #endif +#include #include #include #include "eventl.h" @@ -478,8 +479,10 @@ 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) +static void assoc_init_reset(association *assoc, const char *peer_name1) { + const char *peer_name2 = cs_addrstr(assoc->client_link); + xfree(assoc->init); assoc->init = (bend_initrequest *) xmalloc(sizeof(*assoc->init)); @@ -509,13 +512,24 @@ static void assoc_init_reset(association *assoc) assoc->init->charneg_response = NULL; assoc->init->decode = assoc->decode; - assoc->init->peer_name = - odr_strdup(assoc->encode, cs_addrstr(assoc->client_link)); + + assoc->init->peer_name = (char *) + odr_malloc(assoc->encode, + (peer_name1 ? strlen(peer_name1) : 0) + + 4 + strlen(peer_name2)); + strcpy(assoc->init->peer_name, ""); + if (peer_name1) + { + strcat(assoc->init->peer_name, peer_name1); + strcat(assoc->init->peer_name, ", "); + } + strcat(assoc->init->peer_name, peer_name2); yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name); } -static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_SRW_PDU *sr) +static int srw_bend_init(association *assoc, Z_HTTP_Header *headers, + Z_SRW_diagnostic **d, int *num, Z_SRW_PDU *sr) { statserv_options_block *cb = statserv_getcontrol(); if (!assoc->init) @@ -525,7 +539,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S bend_initresult *binitres; yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname); - assoc_init_reset(assoc); + assoc_init_reset(assoc, z_HTTP_header_lookup(headers, "X-Forwarded-For")); if (sr->username) { @@ -687,6 +701,7 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr) if (r) { rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + rr->surrogate_flag = 1; if (details) rr->errstring = odr_strdup(rr->stream, details); } @@ -901,6 +916,7 @@ static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset, } static void srw_bend_search(association *assoc, + Z_HTTP_Header *headers, Z_SRW_PDU *sr, Z_SRW_PDU *res, int *http_code) @@ -912,7 +928,8 @@ static void srw_bend_search(association *assoc, *http_code = 200; yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest"); - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + srw_bend_init(assoc, headers, + &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (srw_res->num_diagnostics == 0 && assoc->init) { bend_search_rr rr; @@ -1008,6 +1025,11 @@ static void srw_bend_search(association *assoc, rr.errstring = 0; rr.search_info = 0; rr.search_input = 0; + + if (srw_req->facetList) + yaz_oi_set_facetlist(&rr.search_input, assoc->encode, + srw_req->facetList); + yaz_log_zquery_level(log_requestdetail,rr.query); (assoc->init->bend_search)(assoc->backend, &rr); @@ -1046,6 +1068,7 @@ static void srw_bend_search(association *assoc, odr_intdup(assoc->encode, *rr.srw_setnameIdleTime ); } + srw_res->facetList = yaz_oi_get_facetlist(&rr.search_info); if (start > rr.hits || start < 1) { /* if hits<=0 and start=1 we don't return a diagnostic */ @@ -1160,7 +1183,19 @@ static void srw_bend_search(association *assoc, res->extraResponseData_buf = rr.extra_response_data; res->extraResponseData_len = strlen(rr.extra_response_data); } - if (rr.estimated_hit_count || rr.partial_resultset) + if (strcmp(res->srw_version, "2.") > 0) + { + if (rr.estimated_hit_count) + srw_res->resultCountPrecision = + odr_strdup(assoc->encode, "estimate"); + else if (rr.partial_resultset) + srw_res->resultCountPrecision = + odr_strdup(assoc->encode, "minimum"); + else + srw_res->resultCountPrecision = + odr_strdup(assoc->encode, "exact"); + } + else if (rr.estimated_hit_count || rr.partial_resultset) { yaz_add_srw_diagnostic( assoc->encode, @@ -1235,14 +1270,17 @@ static char *srw_bend_explain_default(bend_explain_rr *rr) } static void srw_bend_explain(association *assoc, + Z_HTTP_Header *headers, Z_SRW_PDU *sr, Z_SRW_explainResponse *srw_res, int *http_code) { Z_SRW_explainRequest *srw_req = sr->u.explain_request; yaz_log(log_requestdetail, "Got SRW ExplainRequest"); - *http_code = 404; - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + srw_bend_init(assoc, headers, + &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (!assoc->init && srw_res->num_diagnostics == 0) + *http_code = 404; if (assoc->init) { bend_explain_rr rr; @@ -1283,6 +1321,7 @@ static void srw_bend_explain(association *assoc, } static void srw_bend_scan(association *assoc, + Z_HTTP_Header *headers, Z_SRW_PDU *sr, Z_SRW_PDU *res, int *http_code) @@ -1292,7 +1331,8 @@ static void srw_bend_scan(association *assoc, yaz_log(log_requestdetail, "Got SRW ScanRequest"); *http_code = 200; - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + srw_bend_init(assoc, headers, + &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (srw_res->num_diagnostics == 0 && assoc->init) { int step_size = 0; @@ -1461,6 +1501,7 @@ static void srw_bend_scan(association *assoc, } static void srw_bend_update(association *assoc, + Z_HTTP_Header *headers, Z_SRW_PDU *sr, Z_SRW_updateResponse *srw_res, int *http_code) @@ -1468,8 +1509,10 @@ static void srw_bend_update(association *assoc, Z_SRW_updateRequest *srw_req = sr->u.update_request; yaz_log(log_session, "SRWUpdate action=%s", srw_req->operation); yaz_log(YLOG_DEBUG, "num_diag = %d", srw_res->num_diagnostics ); - *http_code = 404; - srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + srw_bend_init(assoc, headers, + &srw_res->diagnostics, &srw_res->num_diagnostics, sr); + if (!assoc->init && srw_res->num_diagnostics == 0) + *http_code = 404; if (assoc->init) { bend_update_rr rr; @@ -1829,7 +1872,7 @@ static void process_http_request(association *assoc, request *req) } else { - srw_bend_search(assoc, sr, res, &http_code); + srw_bend_search(assoc, hreq->headers, sr, res, &http_code); } if (http_code == 200) soap_package->u.generic->p = res; @@ -1844,7 +1887,8 @@ static void process_http_request(association *assoc, request *req) res->u.explain_response->diagnostics = diagnostic; res->u.explain_response->num_diagnostics = num_diagnostic; } - srw_bend_explain(assoc, sr, res->u.explain_response, &http_code); + srw_bend_explain(assoc, hreq->headers, + sr, res->u.explain_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1858,7 +1902,7 @@ static void process_http_request(association *assoc, request *req) res->u.scan_response->diagnostics = diagnostic; res->u.scan_response->num_diagnostics = num_diagnostic; } - srw_bend_scan(assoc, sr, res, &http_code); + srw_bend_scan(assoc, hreq->headers, sr, res, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1873,7 +1917,8 @@ static void process_http_request(association *assoc, request *req) res->u.update_response->num_diagnostics = num_diagnostic; } yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics ); - srw_bend_update(assoc, sr, res->u.update_response, &http_code); + srw_bend_update(assoc, hreq->headers, + sr, res->u.update_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1912,11 +1957,6 @@ static void process_http_request(association *assoc, request *req) hres->code = http_code; strcpy(ctype, "text/xml"); - if (charset && strlen(charset) < sizeof(ctype)-30) - { - strcat(ctype, "; charset="); - strcat(ctype, charset); - } z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); } else @@ -2171,8 +2211,9 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) yaz_log(log_requestdetail, "Version: %s", req->implementationVersion); - assoc_init_reset(assoc); - + assoc_init_reset(assoc, + yaz_oi_get_string_oid(&req->otherInfo, + yaz_oid_userinfo_client_ip, 1, 0)); assoc->init->auth = req->idAuthentication; assoc->init->referenceId = req->referenceId; @@ -2662,7 +2703,9 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->errcode = 0; bsrr->errstring = NULL; bsrr->search_info = NULL; - bsrr->search_input = req->otherInfo; + bsrr->search_input = req->additionalSearchInfo; + if (!bsrr->search_input) + bsrr->search_input = req->otherInfo; bsrr->present_number = *req->mediumSetPresentNumber; if (assoc->server && assoc->server->cql_transform @@ -3079,7 +3122,6 @@ 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) @@ -3106,12 +3148,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) t->term = (Z_Term *) odr_malloc(assoc->encode, sizeof(*t->term)); t->term->which = Z_Term_general; - t->term->u.general = o = - (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct)); - o->buf = (unsigned char *) - odr_malloc(assoc->encode, o->len = o->size = - strlen(bsrr->entries[i].term)); - memcpy(o->buf, bsrr->entries[i].term, o->len); + t->term->u.general = + odr_create_Odr_oct(assoc->encode, + bsrr->entries[i].term, + strlen(bsrr->entries[i].term)); yaz_log(YLOG_DEBUG, " term #%d: '%s' (" ODR_INT_PRINTF ")", i, bsrr->entries[i].term, bsrr->entries[i].occurrences); }