X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=d320f022016e0540ae1d6f9aca51a00c9f5a6e51;hb=a87770ed51d988ce5a0b2f5f886dd4211c4055d6;hp=6349c4e0881c366a8dc4c90d8a9f48beebd9d716;hpb=725fc033b729b22a1e0cfba614192b6fbfaeda4f;p=yaz-moved-to-github.git diff --git a/src/seshigh.c b/src/seshigh.c index 6349c4e..d320f02 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.24 2004-05-10 07:48:56 adam Exp $ + * $Id: seshigh.c,v 1.27 2004-09-10 11:28:58 adam Exp $ */ /* @@ -606,7 +606,8 @@ static void srw_bend_search(association *assoc, request *req, 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, ""); + if (off < 200) + yaz_log(LOG_LOG, "%*s^\n", (int)off+4, ""); yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code); srw_error = 10; @@ -649,7 +650,6 @@ static void srw_bend_search(association *assoc, request *req, rr.search_info = 0; yaz_log_zquery(rr.query); (assoc->init->bend_search)(assoc->backend, &rr); - 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); @@ -1033,6 +1033,8 @@ static int process_z_request(association *assoc, request *req, char **msg) return -1; } break; + case Z_APDU_triggerResourceControlRequest: + return 0; default: *msg = "Bad APDU received"; return -1; @@ -1285,6 +1287,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) ODR_MASK_SET(resp->options, Z_Options_negotiationModel); strcat(options, " negotiation"); } + + ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl); if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) { @@ -1321,7 +1325,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); - version = odr_strdup(assoc->encode, "$Revision: 1.24 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.27 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode,