X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=6d61a122ab82b838e2fe0a19ef2a532f5a650493;hp=6a682ed7e2f0db5b5988cf90db5c069f17bb1bda;hb=d0ef7e3d61ea8c14a8649fd199e9060039f3b7b0;hpb=2f1df9e6d0f93335cf2a6a487b0a06b43ff37b0c

diff --git a/asn/proto.c b/asn/proto.c
index 6a682ed..6d61a12 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.45  1996-02-23 10:00:25  quinn
+ * Revision 1.47  1996-05-29 15:47:50  quinn
+ * Fixed in bug DiagRecs decoder. Thanks to Linda Harris.
+ *
+ * Revision 1.46  1996/04/10  11:39:42  quinn
+ * Fixed bug in UserInfo
+ *
+ * Revision 1.45  1996/02/23  10:00:25  quinn
  * Fixes to SCAN
  *
  * Revision 1.44  1996/02/20  12:51:41  quinn
@@ -218,7 +224,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
     	return opt && odr_ok(o);
     return
     	odr_implicit(o, z_InfoCategory, &(*p)->category, ODR_CONTEXT, 1, 1) &&
-	odr_choice(o, arm, &(*p)->which, &(*p)->information) &&
+	odr_choice(o, arm, &(*p)->information, &(*p)->which) &&
 	odr_sequence_end(o);
 }
     
@@ -870,7 +876,7 @@ int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
     	&(*p)->num_diagRecs))
     	return 1;
     *p = 0;
-    return 0;
+    return opt && odr_ok(o);
 }
 
 int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)