X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=4d2ecf0b6b706e7780fc1fc8ed00b111f874b8db;hb=50e841cfceee9afecc96294187738e21669310ea;hp=ce4d41203b1d23f96d3fac1f5b1d1f80f659b06a;hpb=39f322672612cc6146a9a85fd32d2f8c325763da;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index ce4d412..4d2ecf0 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.141 2003-02-18 14:28:52 adam Exp $ + * $Id: seshigh.c,v 1.147 2003-02-23 20:39:31 adam Exp $ */ /* @@ -39,6 +39,7 @@ #include #endif #include +#include #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include #include @@ -318,7 +320,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)) @@ -413,11 +415,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; @@ -438,9 +438,20 @@ 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) +{ + bend_initresult *binitres; + statserv_options_block *cb = statserv_getcontrol(); + + assoc_init_reset(assoc); + + assoc->maximumRecordSize = 3000000; + assoc->preferredMessageSize = 3000000; - 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."); @@ -450,9 +461,9 @@ static int srw_bend_init(association *assoc) return 1; } -static void srw_bend_fetch(association *assoc, int pos, - Z_SRW_searchRetrieveRequest *srw_req, - Z_SRW_record *record) +static int srw_bend_fetch(association *assoc, int pos, + Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_record *record) { bend_fetch_rr rr; ODR o = assoc->encode; @@ -495,7 +506,10 @@ static void 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) @@ -507,41 +521,99 @@ static void srw_bend_fetch(association *assoc, int pos, if (srw_req->recordSchema) record->recordSchema = odr_strdup(o, srw_req->recordSchema); } + return rr.errcode; } 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; rr.basenames = &srw_req->database; rr.referenceId = 0; - ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); - ext->direct_reference = odr_getoidbystr(assoc->decode, - "1.2.840.10003.16.2"); - ext->indirect_reference = 0; - ext->descriptor = 0; - ext->which = Z_External_CQL; - if (srw_req->query) - ext->u.cql = srw_req->query; - else - ext->u.cql = "noterm"; - rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); - rr.query->which = Z_Query_type_104; - rr.query->u.type_104 = ext; + + 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, + "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; + } + else if (srw_req->query_type == Z_SRW_query_type_pqf) + { + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create (); + + RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, + srw_req->query.pqf); + if (!RPNquery) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + yaz_log(LOG_LOG, "%*s^\n", off+4, ""); + yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code); + + srw_error = 10; + } + + rr.query->which = Z_Query_type_1; + rr.query->u.type_1 = RPNquery; + + yaz_pqf_destroy (pqf_parser); + } + else + srw_error = 11; + + if (!srw_error && srw_req->sort_type != Z_SRW_sort_type_none) + srw_error = 80; + + if (!srw_error && !assoc->init->bend_search) + srw_error = 1; + + if (srw_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.stream = assoc->encode; rr.decode = assoc->decode; @@ -562,7 +634,8 @@ static void srw_bend_search(association *assoc, request *req, srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); srw_res->diagnostics[0].code = - odr_intdup(assoc->encode, rr.errcode); + odr_intdup(assoc->encode, + yaz_diag_bib1_to_srw (rr.errcode)); srw_res->diagnostics[0].details = rr.errstring; } else @@ -585,9 +658,22 @@ static void srw_bend_search(association *assoc, request *req, number * sizeof(*srw_res->records)); for (i = 0; irecords[j].recordData_buf = 0; - srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); + errcode = srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j); + if (errcode) + { + 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, + yaz_diag_bib1_to_srw (errcode)); + srw_res->diagnostics[0].details = rr.errstring; + break; + } if (srw_res->records[j].recordData_buf) j++; } @@ -703,28 +789,30 @@ static void process_http_request(association *assoc, request *req) !yaz_strcmp_del("text/xml", content_type, "; ")) { Z_SOAP *soap_package = 0; - int ret; + int ret = -1; int http_code = 500; static Z_SOAP_Handler soap_handlers[2] = { +#if HAVE_XML2 {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec}, +#endif {0, 0, 0} }; - ret = z_soap_codec(assoc->decode, &soap_package, &hreq->content_buf, &hreq->content_len, soap_handlers); +#if HAVE_XML2 if (!ret && soap_package->which == Z_SOAP_generic && 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); @@ -753,7 +841,7 @@ static void process_http_request(association *assoc, request *req) http_code = 200; } } - +#endif p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; ret = z_soap_codec(assoc->encode, &soap_package, @@ -804,7 +892,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); @@ -1021,40 +1109,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 @@ -1072,9 +1134,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); @@ -1083,24 +1142,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)) { @@ -1110,8 +1155,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."); @@ -1223,11 +1266,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;