X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=a2a28f9a14f5eb0017fe3f81368e9babd2bdfcd2;hp=5f8a5c2ab4768269e87fe9c145ba40156a947947;hb=06e73cb9f6d59fc7a38f17636016f2daaed02548;hpb=6a9f385c94281b3dbddd612f388837c01661c5c5 diff --git a/server/seshigh.c b/server/seshigh.c index 5f8a5c2..a2a28f9 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.149 2003-03-18 13:34:36 adam Exp $ + * $Id: seshigh.c,v 1.154 2003-04-24 13:30:32 adam Exp $ */ /* @@ -436,8 +436,11 @@ static void assoc_init_reset(association *assoc) assoc->init->bend_scan = NULL; assoc->init->bend_segment = NULL; assoc->init->bend_fetch = NULL; + assoc->init->bend_explain = NULL; + 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)); @@ -512,6 +515,7 @@ static int srw_bend_fetch(association *assoc, int pos, rr.errcode = 0; rr.errstring = 0; rr.surrogate_flag = 0; + rr.schema = srw_req->recordSchema; if (!assoc->init->bend_fetch) return 1; @@ -523,9 +527,10 @@ static int srw_bend_fetch(association *assoc, int pos, record->recordData_buf = rr.record; record->recordData_len = rr.len; record->recordPosition = odr_intdup(o, pos); - record->recordSchema = 0; - if (srw_req->recordSchema) - record->recordSchema = odr_strdup(o, srw_req->recordSchema); + if (rr.schema) + record->recordSchema = odr_strdup(o, rr.schema); + else + record->recordSchema = 0; } return rr.errcode; } @@ -648,7 +653,7 @@ static void srw_bend_search(association *assoc, request *req, 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); + *srw_res->diagnostics[0].code); } else @@ -669,14 +674,20 @@ static void srw_bend_search(association *assoc, request *req, 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, @@ -704,6 +715,35 @@ static void srw_bend_search(association *assoc, request *req, } } + +static void srw_bend_explain(association *assoc, request *req, + Z_SRW_explainRequest *srw_req, + Z_SRW_explainResponse *srw_res) +{ + yaz_log(LOG_LOG, "Got SRW ExplainRequest"); + if (!assoc->init) + { + yaz_log(LOG_DEBUG, "srw_bend_init"); + if (!srw_bend_init(assoc)) + return; + } + if (assoc->init && assoc->init->bend_explain) + { + bend_explain_rr rr; + + rr.stream = assoc->encode; + rr.decode = assoc->decode; + rr.print = assoc->print; + rr.explain_buf = 0; + (*assoc->init->bend_explain)(assoc->backend, &rr); + if (rr.explain_buf) + { + srw_res->explainData_buf = rr.explain_buf; + srw_res->explainData_len = strlen(rr.explain_buf); + } + } +} + static int hex_digit (int ch) { if (ch >= '0' && ch <= '9') @@ -802,7 +842,7 @@ static void process_http_request(association *assoc, request *req) memcpy (db, p0, p1 - p0); db[p1 - p0] = '\0'; } - +#if HAVE_XML2 if (p1 && *p1 == '?' && p1[1]) { Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_searchRetrieve_response); @@ -827,6 +867,9 @@ static void process_http_request(association *assoc, request *req) sr->u.request->sort.sortKeys = sortKeys; } sr->u.request->recordSchema = uri_val(p1, "recordSchema", o); + sr->u.request->recordPacking = uri_val(p1, "recordPacking", o); + if (!sr->u.request->recordPacking) + sr->u.request->recordPacking = "xml"; uri_val_int(p1, "maximumRecords", o, &sr->u.request->maximumRecords); uri_val_int(p1, "startRecord", o, @@ -834,8 +877,7 @@ static void process_http_request(association *assoc, request *req) 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); + 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; @@ -866,6 +908,47 @@ static void process_http_request(association *assoc, request *req) } } + else + { + Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_explain_response); + Z_SRW_PDU *sr = yaz_srw_get(o, Z_SRW_explain_request); + + srw_bend_explain(assoc, req, sr->u.explain_request, + res->u.explain_response); + + if (res->u.explain_response->explainData_buf) + { + 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); + } + } + } +#endif #ifdef DOCDIR if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 && !memcmp(hreq->path, "/doc/", 5)) @@ -917,6 +1000,8 @@ static void process_http_request(association *assoc, request *req) } } #endif + +#if 0 if (!strcmp(hreq->path, "/")) { #ifdef DOCDIR @@ -945,6 +1030,8 @@ static void process_http_request(association *assoc, request *req) hres->content_len = strlen(hres->content_buf); z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/html"); } +#endif + if (!p) { p = z_get_HTTP_Response(o, 404); @@ -954,10 +1041,7 @@ static void process_http_request(association *assoc, request *req) { const char *content_type = z_HTTP_header_lookup(hreq->headers, "Content-Type"); - const char *soap_action = z_HTTP_header_lookup(hreq->headers, - "SOAPAction"); - if (content_type && soap_action && - !yaz_strcmp_del("text/xml", content_type, "; ")) + if (content_type && !yaz_strcmp_del("text/xml", content_type, "; ")) { Z_SOAP *soap_package = 0; int ret = -1; @@ -968,7 +1052,7 @@ static void process_http_request(association *assoc, request *req) 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}, + (Z_SOAP_fun) yaz_srw_codec}, #endif {0, 0, 0} }; @@ -987,7 +1071,6 @@ static void process_http_request(association *assoc, request *req) 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) @@ -1025,6 +1108,29 @@ static void process_http_request(association *assoc, request *req) soap_package->u.generic->p = res; http_code = 200; } + else if (sr->which == Z_SRW_explain_request) + { + Z_SRW_PDU *res = + yaz_srw_get(assoc->encode, Z_SRW_explain_response); + + srw_bend_explain(assoc, req, sr->u.explain_request, + res->u.explain_response); + if (!res->u.explain_response->explainData_buf) + { + z_soap_error(assoc->encode, soap_package, + "SOAP-ENV:Client", "Explain Not Supported", 0); + } + else + { + soap_package->u.generic->p = res; + http_code = 200; + } + } + else + { + z_soap_error(assoc->encode, soap_package, + "SOAP-ENV:Client", "Bad method", 0); + } } #endif p = z_get_HTTP_Response(o, 200); @@ -1649,8 +1755,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, freq.output_format_raw = 0; freq.stream = a->encode; freq.print = a->print; - freq.surrogate_flag = 0; freq.referenceId = referenceId; + freq.schema = 0; (*a->init->bend_fetch)(a->backend, &freq); /* backend should be able to signal whether error is system-wide or only pertaining to current record */ @@ -1999,6 +2105,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) oident *attset; bend_scan_rr *bsrr = (bend_scan_rr *) odr_malloc (assoc->encode, sizeof(*bsrr)); + struct scan_entry *save_entries; yaz_log(LOG_LOG, "Got ScanRequest"); @@ -2036,6 +2143,28 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) bsrr->stream = assoc->encode; bsrr->print = assoc->print; bsrr->step_size = res->stepSize; + bsrr->entries = 0; + /* Note that version 2.0 of YAZ and older did not set entries .. + We do now. And when we do it's easier to extend the scan entry + We know that if the scan handler did set entries, it will + not know of new member display_term. + */ + if (bsrr->num_entries > 0) + { + int i; + bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) * + bsrr->num_entries); + for (i = 0; inum_entries; i++) + { + bsrr->entries[i].term = 0; + bsrr->entries[i].occurrences = 0; + bsrr->entries[i].errcode = 0; + bsrr->entries[i].errstring = 0; + bsrr->entries[i].display_term = 0; + } + } + save_entries = bsrr->entries; /* save it so we can compare later */ + if (req->attributeSet && (attset = oid_getentbyoid(req->attributeSet)) && (attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL)) @@ -2077,6 +2206,16 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) odr_malloc(assoc->encode, sizeof(*t)); t->suggestedAttributes = 0; t->displayTerm = 0; + 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, + bsrr->entries[i].display_term); + } t->alternativeTerm = 0; t->byAttributes = 0; t->otherTermInfo = 0;