From 51f5ff156a2550d96b6d27fd901edaab161b32c8 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Feb 2004 21:39:44 +0000
Subject: [PATCH] Fixed a bug in ASN.1 compiler that caused Type-1 Operator
 codec to fail

---
 CHANGELOG        |    4 ++++
 util/yaz-asncomp |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a5b557d..c678e06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+Fixed a bug in ASN.1 compiler that caused Type-1 Operator codec to fail.
+
+Make ZOOM error code for "invalid query".
+
 Fixed compilation for SSL which wasn't properly enabled for all platforms.
 
 --- 2.0.10 2004/02/05 
diff --git a/util/yaz-asncomp b/util/yaz-asncomp
index f035b56..e2a832d 100755
--- a/util/yaz-asncomp
+++ b/util/yaz-asncomp
@@ -6,7 +6,7 @@ exec tclsh "$0" "$@"
 # (c) Index Data 1996-2004
 # See the file LICENSE for details.
 #
-# $Id: yaz-asncomp,v 1.2 2004-01-23 11:52:52 adam Exp $
+# $Id: yaz-asncomp,v 1.3 2004-02-11 21:39:45 adam Exp $
 #
 
 set yc_version 0.3
@@ -842,8 +842,6 @@ proc asnChoice {name tag implicit tagtype} {
 	lappend l "\todr_implicit_settag(o, $tagtype, $tag);"
 	lappend l "\tif (odr_choice(o, arm, &(*p)->[lindex $uName 1], &(*p)->[lindex $uName 0], name))"
     } else {
-	lappend l "\tif (!*p && o->direction != ODR_DECODE)"
-	lappend l "\t\treturn opt;"
 	lappend l "\tif (!odr_constructed_begin(o, p, $tagtype, $tag, 0))"
 	lappend l "\t\treturn odr_missing(o, opt, name);"
 	lappend l "\tif (!odr_initmember(o, p, sizeof(**p)))"
-- 
1.7.10.4