X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=e8c643997b5c063b0d3b48084b8ff2e46560b5be;hb=1e5554fc59c8cad2105b2a8cf095d13315dc6ed1;hp=968b284072379fce8a29e608ce33baff0cd5ccf8;hpb=e12377e7ea8e58cf447492b5cb9887b839a78700;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 968b284..e8c6439 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.143 2003-02-19 15:22:11 adam Exp $ + * $Id: seshigh.c,v 1.148 2003-03-11 11:09:17 adam Exp $ */ /* @@ -39,6 +39,7 @@ #include #endif #include +#include #include #include @@ -99,6 +100,7 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; anew->init = 0; + anew->version = 0; anew->client_chan = channel; anew->client_link = link; anew->cs_get_mask = 0; @@ -319,7 +321,7 @@ void ir_session(IOCHAN h, int event) assoc->input_buffer[0] & 0xff, assoc->input_buffer[1] & 0xff, assoc->input_buffer[2] & 0xff); - req = request_get(&assoc->incoming); /* get a new request structure */ + req = request_get(&assoc->incoming); /* get a new request */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0)) @@ -414,11 +416,9 @@ void ir_session(IOCHAN h, int event) static int process_z_request(association *assoc, request *req, char **msg); -static int srw_bend_init(association *assoc) +static void assoc_init_reset(association *assoc) { - bend_initresult *binitres; - statserv_options_block *cb = statserv_getcontrol(); - + xfree (assoc->init); assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); assoc->init->stream = assoc->encode; @@ -439,9 +439,25 @@ static int srw_bend_init(association *assoc) assoc->init->charneg_request = NULL; assoc->init->charneg_response = NULL; assoc->init->decode = assoc->decode; + assoc->init->peer_name = + odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); +} + +static int srw_bend_init(association *assoc) +{ + const char *encoding = "UTF-8"; + Z_External *ce; + bend_initresult *binitres; + statserv_options_block *cb = statserv_getcontrol(); + + assoc_init_reset(assoc); - assoc->init->peer_name = - odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); + 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; +#endif if (!(binitres = (*cb->bend_init)(assoc->init))) { yaz_log(LOG_WARN, "Bad response from backend."); @@ -496,7 +512,10 @@ static int srw_bend_fetch(association *assoc, int pos, rr.errcode = 0; rr.errstring = 0; rr.surrogate_flag = 0; - + + if (!assoc->init->bend_fetch) + return 1; + (*assoc->init->bend_fetch)(assoc->backend, &rr); if (rr.len >= 0) @@ -515,16 +534,27 @@ static void srw_bend_search(association *assoc, request *req, Z_SRW_searchRetrieveRequest *srw_req, Z_SRW_searchRetrieveResponse *srw_res) { - char *base = "Default"; int srw_error = 0; bend_search_rr rr; Z_External *ext; yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest"); - if (!assoc->init) - srw_bend_init(assoc); - + { + if (!srw_bend_init(assoc)) + { + srw_error = 3; /* assume Authentication error */ + + srw_res->num_diagnostics = 1; + srw_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); + srw_res->diagnostics[0].code = + odr_intdup(assoc->encode, srw_error); + srw_res->diagnostics[0].details = 0; + return; + } + } + rr.setname = "default"; rr.replace_set = 1; rr.num_bases = 1; @@ -533,7 +563,7 @@ static void srw_bend_search(association *assoc, request *req, rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); - if (srw_req->query) + if (srw_req->query_type == Z_SRW_query_type_cql) { ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); ext->direct_reference = odr_getoidbystr(assoc->decode, @@ -541,21 +571,20 @@ static void srw_bend_search(association *assoc, request *req, ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_CQL; - ext->u.cql = srw_req->query; + ext->u.cql = srw_req->query.cql; rr.query->which = Z_Query_type_104; rr.query->u.type_104 = ext; } - else if (srw_req->pQuery) + else if (srw_req->query_type == Z_SRW_query_type_pqf) { Z_RPNQuery *RPNquery; YAZ_PQF_Parser pqf_parser; pqf_parser = yaz_pqf_create (); - yaz_log(LOG_LOG, "PQF: %s", srw_req->pQuery); - - RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, srw_req->pQuery); + RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, + srw_req->query.pqf); if (!RPNquery) { const char *pqf_msg; @@ -575,9 +604,12 @@ static void srw_bend_search(association *assoc, request *req, else srw_error = 11; - if (srw_req->sortKeys || srw_req->xSortKeys) + 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; + if (srw_error) { srw_res->num_diagnostics = 1; @@ -588,7 +620,6 @@ static void srw_bend_search(association *assoc, request *req, srw_res->diagnostics[0].details = 0; return; } - rr.stream = assoc->encode; rr.decode = assoc->decode; @@ -636,7 +667,7 @@ static void srw_bend_search(association *assoc, request *req, int errcode; srw_res->records[j].recordData_buf = 0; errcode = srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); + srw_res->records + j); if (errcode) { srw_res->num_diagnostics = 1; @@ -766,6 +797,8 @@ static void process_http_request(association *assoc, request *req) Z_SOAP *soap_package = 0; int ret = -1; int http_code = 500; + const char *charset_p = 0; + char *charset = 0; static Z_SOAP_Handler soap_handlers[2] = { #if HAVE_XML2 @@ -774,6 +807,18 @@ static void process_http_request(association *assoc, request *req) #endif {0, 0, 0} }; + if ((charset_p = strstr(content_type, "; charset="))) + { + int i = 0; + charset_p += 10; + while (i < 20 && charset_p[i] && + !strchr("; \n\r", charset_p[i])) + i++; + charset = odr_malloc(assoc->encode, i+1); + memcpy(charset, charset_p, i); + charset[i] = '\0'; + yaz_log(LOG_LOG, "SOAP encoding %s", charset); + } ret = z_soap_codec(assoc->decode, &soap_package, &hreq->content_buf, &hreq->content_len, soap_handlers); @@ -783,11 +828,11 @@ static void process_http_request(association *assoc, request *req) soap_package->u.generic->no == 0) { /* SRW package */ - Z_SRW_searchRetrieve *sr = soap_package->u.generic->p; + Z_SRW_PDU *sr = soap_package->u.generic->p; if (sr->which == Z_SRW_searchRetrieve_request) { - Z_SRW_searchRetrieve *res = + Z_SRW_PDU *res = yaz_srw_get(assoc->encode, Z_SRW_searchRetrieve_response); @@ -819,11 +864,19 @@ static void process_http_request(association *assoc, request *req) #endif p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; - ret = z_soap_codec(assoc->encode, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers); + ret = z_soap_codec_enc(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset); hres->code = http_code; - z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml"); + if (!charset) + z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml"); + else + { + char ctype[60]; + strcpy(ctype, "text/xml; charset="); + strcat(ctype, charset); + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + } } if (!p) /* still no response ? */ p = z_get_HTTP_Response(o, 500); @@ -867,7 +920,7 @@ static void process_http_request(association *assoc, request *req) if (alive && isdigit(*alive)) t = atoi(alive); else - t = 30; + t = 15; if (t < 0 || t > 3600) t = 3600; iochan_settimeout(assoc->client_chan,t); @@ -1084,40 +1137,14 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) */ static int process_z_response(association *assoc, request *req, Z_APDU *res) { - odr_setbuf(assoc->encode, req->response, req->size_response, 1); + Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*res)); + gres->which = Z_GDU_Z3950; + gres->u.z3950 = res; - if (assoc->print && !z_APDU(assoc->print, &res, 0, 0)) - { - yaz_log(LOG_WARN, "ODR print error: %s", - odr_errmsg(odr_geterror(assoc->print))); - odr_reset(assoc->print); - } - if (!z_APDU(assoc->encode, &res, 0, 0)) - { - yaz_log(LOG_WARN, "ODR error when encoding response: %s", - odr_errmsg(odr_geterror(assoc->decode))); - return -1; - } - req->response = odr_getbuf(assoc->encode, &req->len_response, - &req->size_response); - odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */ - odr_reset(assoc->encode); - req->state = REQUEST_IDLE; - request_enq(&assoc->outgoing, req); - /* turn the work over to the ir_session handler */ - iochan_setflag(assoc->client_chan, EVENT_OUTPUT); - assoc->cs_put_mask = EVENT_OUTPUT; - /* Is there more work to be done? give that to the input handler too */ -#if 1 - if (request_head(&assoc->incoming)) - { - yaz_log (LOG_DEBUG, "more work to be done"); - iochan_setevent(assoc->client_chan, EVENT_WORK); - } -#endif - return 0; + return process_gdu_response(assoc, req, gres); } + /* * Handle init request. * At the moment, we don't check the options @@ -1135,9 +1162,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) char options[140]; - xfree (assoc->init); - assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); - yaz_log(LOG_LOG, "Got initRequest"); if (req->implementationId) yaz_log(LOG_LOG, "Id: %s", req->implementationId); @@ -1146,24 +1170,10 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (req->implementationVersion) yaz_log(LOG_LOG, "Version: %s", req->implementationVersion); - assoc->init->stream = assoc->encode; - assoc->init->print = assoc->print; + assoc_init_reset(assoc); + assoc->init->auth = req->idAuthentication; assoc->init->referenceId = req->referenceId; - assoc->init->implementation_version = 0; - assoc->init->implementation_id = 0; - assoc->init->implementation_name = 0; - assoc->init->bend_sort = NULL; - assoc->init->bend_search = NULL; - assoc->init->bend_present = NULL; - assoc->init->bend_esrequest = NULL; - assoc->init->bend_delete = NULL; - assoc->init->bend_scan = NULL; - assoc->init->bend_segment = NULL; - assoc->init->bend_fetch = NULL; - assoc->init->charneg_request = NULL; - assoc->init->charneg_response = NULL; - assoc->init->decode = assoc->decode; if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)) { @@ -1173,8 +1183,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->charneg_request = negotiation; } - assoc->init->peer_name = - odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); if (!(binitres = (*cb->bend_init)(assoc->init))) { yaz_log(LOG_WARN, "Bad response from backend."); @@ -1286,11 +1294,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (assoc->preferredMessageSize > assoc->maximumRecordSize) assoc->preferredMessageSize = assoc->maximumRecordSize; -#if 0 - assoc->maximumRecordSize = 3000000; - assoc->preferredMessageSize = 3000000; -#endif - resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize;