X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=6c8d071f0594dd6fb9c7c7d0b6396d649b3d6b36;hb=e38c23b29a89e9c4e1cd5aa9033015efc39b26c0;hp=22df1a80d83ae3ad48209115cbe74e72e6a58acb;hpb=a6af2d19dddb0c2ef961d087d8ca0f2b3bda8f7a;p=yaz-moved-to-github.git diff --git a/src/seshigh.c b/src/seshigh.c index 22df1a8..6c8d071 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.69 2006-03-15 13:32:05 adam Exp $ + * $Id: seshigh.c,v 1.72 2006-03-16 12:30:03 adam Exp $ */ /** * \file seshigh.c @@ -517,8 +517,9 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num) assoc->backend = binitres->handle; if (binitres->errcode) { + int srw_code = yaz_diag_bib1_to_srw(binitres->errcode); assoc->state = ASSOC_DEAD; - yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode, + yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code, binitres->errstring); return 0; } @@ -1590,10 +1591,13 @@ static void process_http_request(association *assoc, request *req) p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; - yaz_log(YLOG_LOG, "assoc->stylesheet=%s", assoc->stylesheet); if (!stylesheet) stylesheet = assoc->stylesheet; + /* empty stylesheet means NO stylesheet */ + if (stylesheet && *stylesheet == '\0') + stylesheet = 0; + ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package, &hres->content_buf, &hres->content_len, soap_handlers, charset, stylesheet); @@ -2068,7 +2072,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.69 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.72 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode,