X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=634bc4e5f1b70c08b044cabf03d18db5433b2318;hb=f98330f4a395ec9f830c39b4a4eb4e523bc0c796;hp=53ab94caa11b57bbae73f99951771f2e97d2ff53;hpb=98423c2327870156c36dfe479746f541ee244ef2;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 53ab94c..634bc4e 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.153 2003-04-18 15:11:04 adam Exp $ + * $Id: seshigh.c,v 1.157 2003-05-20 20:22:11 adam Exp $ */ /* @@ -326,8 +326,10 @@ void ir_session(IOCHAN h, int event) odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0)) { - yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", + yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [addinfo %s] " + "[near byte %d] ", odr_errmsg(odr_geterror(assoc->decode)), + odr_getaddinfo(assoc->decode), odr_offset(assoc->decode)); if (assoc->decode->error != OHTTP) { @@ -515,6 +517,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; @@ -526,9 +529,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; } @@ -656,20 +660,22 @@ static void srw_bend_search(association *assoc, request *req, } else { + int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0; + int start = srw_req->startRecord ? *srw_req->startRecord : 1; + + yaz_log(LOG_LOG, "Request to pack %d+%d out of %d", + start, number, rr.hits); + srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); - if (srw_req->maximumRecords && *srw_req->maximumRecords > 0) + if (number > 0) { - 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) + if (start > rr.hits) + { + yaz_log(LOG_LOG, "Request out or range"); + } + else { int j = 0; int packing = Z_SRW_recordPacking_string; @@ -816,18 +822,18 @@ 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 + int ret = -1; + char *charset = 0; + Z_SOAP *soap_package = 0; + static Z_SOAP_Handler soap_handlers[2] = { {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec}, -#endif {0, 0, 0} }; +#endif if (*p0 == '/') p0++; @@ -1377,8 +1383,9 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) } if (!z_GDU(assoc->encode, &res, 0, 0)) { - yaz_log(LOG_WARN, "ODR error when encoding response: %s", - odr_errmsg(odr_geterror(assoc->decode))); + yaz_log(LOG_WARN, "ODR error when decoding PDU: %s [addinfo %s]", + odr_errmsg(odr_geterror(assoc->decode)), + odr_getaddinfo(assoc->decode)); return -1; } req->response = odr_getbuf(assoc->encode, &req->len_response, @@ -1753,8 +1760,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 */ @@ -2103,6 +2110,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"); @@ -2140,6 +2148,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)) @@ -2181,6 +2211,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;