X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=9371662723296f794b7a992db700651556be2b99;hb=d21f71aa7f9d30fdf457c58e7403723415506c1e;hp=4427a8819e7ffaba25a18e653432d21521b54cdb;hpb=4ca818ec201c9dcf5461e419002c95fd2eac620e;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 4427a88..9371662 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.145 2003-02-21 12:08:59 adam Exp $ + * $Id: seshigh.c,v 1.150 2003-03-20 21:15:00 adam Exp $ */ /* @@ -100,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; @@ -444,6 +445,8 @@ static void assoc_init_reset(association *assoc) static int srw_bend_init(association *assoc) { + const char *encoding = "UTF-8"; + Z_External *ce; bend_initresult *binitres; statserv_options_block *cb = statserv_getcontrol(); @@ -451,7 +454,10 @@ static int srw_bend_init(association *assoc) 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."); @@ -506,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) @@ -530,9 +539,24 @@ static void srw_bend_search(association *assoc, request *req, Z_External *ext; yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest"); + yaz_log(LOG_DEBUG, "srw_bend_search"); if (!assoc->init) - srw_bend_init(assoc); - + { + yaz_log(LOG_DEBUG, "srw_bend_init"); + 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; @@ -541,7 +565,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, @@ -549,21 +573,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; @@ -583,11 +606,15 @@ 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) { + yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d", srw_error); srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); @@ -596,7 +623,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; @@ -613,6 +639,7 @@ static void srw_bend_search(association *assoc, request *req, srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); if (rr.errcode) { + yaz_log(LOG_DEBUG, "bend_search returned Bib-1 code %d", rr.errcode); srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); @@ -620,6 +647,9 @@ static void srw_bend_search(association *assoc, request *req, odr_intdup(assoc->encode, yaz_diag_bib1_to_srw (rr.errcode)); srw_res->diagnostics[0].details = rr.errstring; + yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d", + srw_res->diagnostics[0].code); + } else { @@ -629,22 +659,34 @@ static void srw_bend_search(association *assoc, request *req, int number = *srw_req->maximumRecords; int start = 1; int i; + if (srw_req->startRecord) start = *srw_req->startRecord; + + yaz_log(LOG_DEBUG, "srw_bend_search. start=%d max=%d", + start, *srw_req->maximumRecords); + if (start <= rr.hits) { int j = 0; + int packing = Z_SRW_recordPacking_string; if (start + number > rr.hits) number = rr.hits - start + 1; + if (srw_req->recordPacking && + !strcmp(srw_req->recordPacking, "xml")) + packing = Z_SRW_recordPacking_XML; srw_res->records = (Z_SRW_record *) odr_malloc(assoc->encode, number * sizeof(*srw_res->records)); for (i = 0; irecords[j].recordPacking = packing; srw_res->records[j].recordData_buf = 0; + yaz_log(LOG_DEBUG, "srw_bend_fetch %d", i+start); errcode = srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); + srw_res->records + j); if (errcode) { srw_res->num_diagnostics = 1; @@ -668,6 +710,70 @@ static void srw_bend_search(association *assoc, request *req, } } +static int hex_digit (int ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + else if (ch >= 'a' && ch <= 'f') + return ch - 'a'+10; + else if (ch >= 'A' && ch <= 'F') + return ch - 'A'+10; + return 0; +} + +static char *uri_val(const char *path, const char *name, ODR o) +{ + size_t nlen = strlen(name); + if (*path != '?') + return 0; + path++; + while (path && *path) + { + const char *p1 = strchr(path, '='); + if (!p1) + break; + if (p1 - path == nlen && !memcmp(path, name, nlen)) + { + size_t i = 0; + char *ret; + + path = p1 + 1; + p1 = strchr(path, '&'); + if (!p1) + p1 = strlen(path) + path; + ret = odr_malloc(o, p1 - path + 1); + while (*path && *path != '&') + { + if (*path == '+') + { + ret[i++] = ' '; + path++; + } + else if (*path == '%' && path[1] && path[2]) + { + ret[i++] = hex_digit (path[1])*16 + hex_digit (path[2]); + path = path + 3; + } + else + ret[i++] = *path++; + } + ret[i] = '\0'; + return ret; + } + path = strchr(p1, '&'); + if (path) + path++; + } + return 0; +} + +void uri_val_int(const char *path, const char *name, ODR o, int **intp) +{ + const char *v = uri_val(path, name, o); + if (v) + *intp = odr_intdup(o, atoi(v)); +} + static void process_http_request(association *assoc, request *req) { Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request; @@ -678,6 +784,95 @@ static void process_http_request(association *assoc, request *req) if (!strcmp(hreq->method, "GET")) { + char *charset = 0; + int ret = -1; + Z_SOAP *soap_package = 0; + char *db = "Default"; + const char *p0 = hreq->path, *p1; + 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} + }; + + if (*p0 == '/') + p0++; + p1 = strchr(p0, '?'); + if (!p1) + p1 = p0 + strlen(p0); + if (p1 != p0) + { + db = odr_malloc(assoc->decode, p1 - p0 + 1); + memcpy (db, p0, p1 - p0); + db[p1 - p0] = '\0'; + } + + if (p1 && *p1 == '?' && p1[1]) + { + Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_searchRetrieve_response); + Z_SRW_PDU *sr = yaz_srw_get(o, Z_SRW_searchRetrieve_request); + char *query = uri_val(p1, "query", o); + char *pQuery = uri_val(p1, "pQuery", o); + char *sortKeys = uri_val(p1, "sortKeys", o); + + if (query) + { + sr->u.request->query_type = Z_SRW_query_type_cql; + sr->u.request->query.cql = query; + } + if (pQuery) + { + sr->u.request->query_type = Z_SRW_query_type_pqf; + sr->u.request->query.pqf = pQuery; + } + if (sortKeys) + { + sr->u.request->sort_type = Z_SRW_sort_type_sort; + sr->u.request->sort.sortKeys = sortKeys; + } + sr->u.request->recordSchema = uri_val(p1, "recordSchema", o); + sr->u.request->recordPacking = uri_val(p1, "recordPacking", o); + uri_val_int(p1, "maximumRecords", o, + &sr->u.request->maximumRecords); + uri_val_int(p1, "startRecord", o, + &sr->u.request->startRecord); + if (sr->u.request->startRecord) + yaz_log(LOG_LOG, "startRecord=%d", *sr->u.request->startRecord); + sr->u.request->database = db; + srw_bend_search(assoc, req, sr->u.request, + res->u.response); + + soap_package = odr_malloc(o, sizeof(*soap_package)); + soap_package->which = Z_SOAP_generic; + + soap_package->u.generic = + odr_malloc(o, sizeof(*soap_package->u.generic)); + + soap_package->u.generic->p = res; + soap_package->u.generic->ns = soap_handlers[0].ns; + soap_package->u.generic->no = 0; + + soap_package->ns = "SRU"; + + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + + ret = z_soap_codec_enc(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset); + 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); + } + + } #ifdef DOCDIR if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 && !memcmp(hreq->path, "/doc/", 5)) @@ -774,6 +969,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 @@ -782,6 +979,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); @@ -791,11 +1000,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); @@ -827,11 +1036,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); @@ -875,7 +1092,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);