From 3543c8e0a0f99d2b59c69a2b3fa97edf86a14cff Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 24 Jan 2004 21:31:59 +0000 Subject: [PATCH] Throw 'unsupported transfer syntax' / 'unsupported ESN' properly. --- src/yaz-proxy-config.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp index ef7b279..d5ab3b2 100644 --- a/src/yaz-proxy-config.cpp +++ b/src/yaz-proxy-config.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy-config.cpp,v 1.24 2004-01-15 23:44:58 adam Exp $ + * $Id: yaz-proxy-config.cpp,v 1.25 2004-01-24 21:31:59 adam Exp $ */ #include @@ -458,7 +458,8 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, } if (match) { - syntax_has_matched = 1; + if (!match_error) + syntax_has_matched = 1; match = check_schema(ptr->children, comp, match_identifier); } if (match) @@ -479,7 +480,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, } if (match_error) { - if (syntax_has_matched) // if syntax did match, schema/ESN was bad + if (syntax_has_matched) // if syntax OK, bad schema/ESN return 25; if (syntax) { -- 1.7.10.4