X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=asn%2Fproto.c;h=b238dd261d771e2a908225af5ef4dee24b3eaa9e;hb=189fa86838b242b5f37e5ea2db92a84935050a81;hp=3fe440184dd157726a90cb294cee4538ae0435e9;hpb=b6851a557131564beda1f460caa1197fd272d310;p=yaz-moved-to-github.git

diff --git a/asn/proto.c b/asn/proto.c
index 3fe4401..b238dd2 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -1,10 +1,34 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.20  1995-05-15 11:55:25  quinn
+ * Revision 1.28  1995-06-14 15:26:35  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.27  1995/06/07  14:36:22  quinn
+ * Added CLOSE
+ *
+ * Revision 1.26  1995/06/02  09:49:13  quinn
+ * Adding access control
+ *
+ * Revision 1.25  1995/05/25  11:00:08  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.24  1995/05/22  13:58:18  quinn
+ * Fixed an ODR_NULLVAL.
+ *
+ * Revision 1.23  1995/05/22  11:30:18  quinn
+ * Adding Z39.50-1992 stuff to proto.c. Adding zget.c
+ *
+ * Revision 1.22  1995/05/17  08:40:56  quinn
+ * Added delete. Fixed some sequence_begins. Smallish.
+ *
+ * Revision 1.21  1995/05/16  08:50:24  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.20  1995/05/15  11:55:25  quinn
  * Smallish.
  *
  * Revision 1.19  1995/04/11  11:58:35  quinn
@@ -89,34 +113,127 @@ int z_ResultSetId(ODR o, char **p, int opt)
 	opt);
 }
 
-int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
+int z_UserInformationField(ODR o, Odr_external **p, int opt)
 {
     return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT,
     	11, opt);
 }
 
+int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_oid, &(*p)->categoryTypeId, ODR_CONTEXT, 1, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->categoryValue, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
+int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_OtherInfo_characterInfo,
+	    odr_visiblestring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
+	    odr_octetstring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
+	    odr_external},
+	{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	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_sequence_end(o);
+}
+    
+int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+{
+    if (o->direction == ODR_ENCODE)
+    	*p = odr_malloc(o, sizeof(**p));
+
+    odr_implicit_settag(o, ODR_CONTEXT, 201);
+    if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+	&(*p)->num_elements))
+	return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_StringOrNumeric_string,
+	    odr_visiblestring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_StringOrNumeric_numeric,
+	    odr_integer},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (o->direction == ODR_DECODE)
+    	*p = odr_malloc(o, sizeof(**p));
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    	return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+/*
+ * check tagging!!
+ */
+int z_Unit(ODR o, Z_Unit **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_visiblestring, &(*p)->unitSystem, ODR_CONTEXT,
+	    1, 1) &&
+	odr_explicit(o, z_StringOrNumeric, &(*p)->unitType, ODR_CONTEXT,
+	    2, 1) &&
+	odr_explicit(o, z_StringOrNumeric, &(*p)->unit, ODR_CONTEXT, 3, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->scaleFactor, ODR_CONTEXT, 4, 1) &&
+	odr_sequence_end(o);
+}
+
+int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_integer, &(*p)->value, ODR_CONTEXT, 1, 0) &&
+	odr_implicit(o, z_Unit, &(*p)->unitUsed, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
+#if 0
 int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	odr_visiblestring(o, &(*p)->user, 0) &&
     	odr_visiblestring(o, &(*p)->password, 0) &&
     	odr_visiblestring(o, &(*p)->account, 0) &&
     	odr_sequence_end(o);
 }
+#endif
 
 int z_IdPass(ODR o, Z_IdPass **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
-    	odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
-    	odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
+    	odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 1) &&
+    	odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 1) &&
     	odr_implicit(o, odr_visiblestring, &(*p)->password, ODR_CONTEXT, 2,
-	    0) &&
+	    1) &&
     	odr_sequence_end(o);
 }
 
@@ -130,7 +247,7 @@ int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt)
     static Odr_arm arm[] =
     {
 	{-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication},
-	{-1, -1, -1, Z_IdAuthentication_idPass, z_NSRAuthentication},
+	{-1, -1, -1, Z_IdAuthentication_idPass, z_IdPass},
 	{-1, -1, -1, Z_IdAuthentication_anonymous, odr_null},
 	{-1, -1, -1, Z_IdAuthentication_other, odr_external},
 	{-1, -1, -1, -1, 0}
@@ -142,7 +259,7 @@ int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
@@ -150,7 +267,7 @@ int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
     Z_InitRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -170,6 +287,9 @@ int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 	odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
 	    ODR_CONTEXT, 112, 1) &&
 	z_UserInformationField(o, &pp->userInformationField, 1) &&
+#ifdef Z_95
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
@@ -178,7 +298,7 @@ int z_InitResponse(ODR o, Z_InitResponse **p, int opt)
     Z_InitResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -197,6 +317,9 @@ int z_InitResponse(ODR o, Z_InitResponse **p, int opt)
 	odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
 	    ODR_CONTEXT, 112, 1) &&
 	z_UserInformationField(o, &pp->userInformationField, 1) &&
+#ifdef Z_95
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
@@ -206,7 +329,7 @@ int z_TriggerResourceControlRequest(ODR o, Z_TriggerResourceControlRequest **p,
 				    int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_ReferenceId(o, &(*p)->referenceId, 1) &&
 	odr_implicit(o, odr_integer, &(*p)->requestedAction, ODR_CONTEXT,
@@ -215,13 +338,16 @@ int z_TriggerResourceControlRequest(ODR o, Z_TriggerResourceControlRequest **p,
 	    ODR_CONTEXT, 47, 1) &&
 	odr_implicit(o, odr_bool, &(*p)->resultSetWanted, ODR_CONTEXT,
 	    48, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
 int z_ResourceControlRequest(ODR o, Z_ResourceControlRequest **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_ReferenceId(o, &(*p)->referenceId, 1) &&
 	odr_implicit(o, odr_bool, &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1)&&
@@ -233,18 +359,24 @@ int z_ResourceControlRequest(ODR o, Z_ResourceControlRequest **p, int opt)
 	    42, 0) &&
 	odr_implicit(o, odr_bool, &(*p)->triggeredRequestFlag,
 	    ODR_CONTEXT, 43, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
 int z_ResourceControlResponse(ODR o, Z_ResourceControlResponse **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_ReferenceId(o, &(*p)->referenceId, 1) &&
 	odr_implicit(o, odr_bool, &(*p)->continueFlag, ODR_CONTEXT, 44, 0) &&
 	odr_implicit(o, odr_bool, &(*p)->resultSetWanted, ODR_CONTEXT,
 	    45, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
@@ -256,15 +388,10 @@ int z_ElementSetName(ODR o, char **p, int opt)
     	opt);
 }
 
-int z_PreferredRecordSyntax(ODR o, Z_PreferredRecordSyntax **p, int opt)
-{
-    return odr_implicit(o, odr_oid, (Odr_oid**) p, ODR_CONTEXT, 104, opt);
-}
-
 int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_DatabaseName(o, &(*p)->databaseName, 0) &&
     	z_ElementSetName(o, &(*p)->elementSetName, 0) &&
@@ -298,7 +425,7 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
     };
 
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 19))
-    	return opt;
+    	return opt && odr_ok(o);
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
@@ -312,20 +439,50 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
 
 /* ----------------------- RPN QUERY -----------------------*/
 
+int z_ComplexAttribute(ODR o, Z_ComplexAttribute **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+    	odr_sequence_of(o, z_StringOrNumeric, &(*p)->list,
+	    &(*p)->num_list) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 2) &&
+	(odr_sequence_of(o, odr_integer, &(*p)->semanticAction,
+	    &(*p)->num_semanticAction) || odr_ok(o)) &&
+	odr_sequence_end(o);
+}
+
 int z_AttributeElement(ODR o, Z_AttributeElement **p, int opt)
 {
+#ifdef Z_95
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 121, Z_AttributeValue_numeric,
+	    odr_integer},
+	{ODR_IMPLICIT, ODR_CONTEXT, 224, Z_AttributeValue_complex,
+	    z_ComplexAttribute},
+	{-1, -1, -1, -1, 0}
+    };
+#endif
+
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
+#ifdef Z_95
+    	odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 1, 1) &&
+#endif
     	odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT,
 	    120, 0) &&
+#ifdef Z_95
+	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+#else
     	odr_implicit(o, odr_integer, &(*p)->attributeValue, ODR_CONTEXT,
 	    121, 0) &&
+#endif
     	odr_sequence_end(o);
 }
 
-#ifdef Z_V3
-
 int z_Term(ODR o, Z_Term **p, int opt)
 {
     static Odr_arm arm[] =
@@ -349,25 +506,54 @@ int z_Term(ODR o, Z_Term **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
-#endif
-
 int z_AttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
 {
     if (!(odr_implicit_settag(o, ODR_CONTEXT, 102) &&
     	odr_sequence_begin(o, p, sizeof(**p))))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	odr_implicit_settag(o, ODR_CONTEXT, 44) &&
     	odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
 	    &(*p)->num_attributes) &&
-#ifdef Z_V3
 	z_Term(o, &(*p)->term, 0) &&
-#else
-	odr_implicit(o, odr_octetstring, &(*p)->term, ODR_CONTEXT, 45, 0) &&
-#endif
+	odr_sequence_end(o);
+}
+
+int z_ResultSetPlusAttributes(ODR o, Z_ResultSetPlusAttributes **p, int opt)
+{
+    if (!(odr_implicit_settag(o, ODR_CONTEXT, 214) &&
+    	odr_sequence_begin(o, p, sizeof(**p))))
+    	return opt && odr_ok(o);
+    return
+    	z_ResultSetId(o, &(*p)->resultSet, 0) &&
+    	odr_implicit_settag(o, ODR_CONTEXT, 44) &&
+    	odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+	    &(*p)->num_attributes) &&
+	odr_sequence_end(o);
+}
+
+int z_ProximityOperator(ODR o, Z_ProximityOperator **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, odr_integer},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_private, odr_integer},
+    	{-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_bool, &(*p)->exclusion, ODR_CONTEXT, 1, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->distance, ODR_CONTEXT, 2, 0) &&
+	odr_implicit(o, odr_bool, &(*p)->ordered, ODR_CONTEXT, 3, 0) &&
+	odr_implicit(o, odr_integer, &(*p)->relationType, ODR_CONTEXT, 4, 0) &&
+	odr_constructed_begin(o, &(*p)->proximityUnitCode, ODR_CONTEXT, 5) &&
+	odr_choice(o, arm, &(*p)->proximityUnitCode, &(*p)->which) &&
+	odr_constructed_end(o) &&
 	odr_sequence_end(o);
 }
 
@@ -378,24 +564,24 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
     	{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, odr_null},
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, odr_null},
     	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, odr_null},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, z_ProximityOperator},
     	{-1, -1, -1, -1, 0}
     };
-    int dummy = 999;
 
     if (!*p && o->direction != ODR_DECODE)
     	return opt;
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
-    	return opt;
+    	return opt && odr_ok(o);
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
     else
-    	(*p)->u.and = &dummy;
+    	(*p)->u.and = ODR_NULLVAL;
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
     	odr_constructed_end(o))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_Operand(ODR o, Z_Operand **p, int opt)
@@ -404,6 +590,7 @@ int z_Operand(ODR o, Z_Operand **p, int opt)
     {
     	{-1, -1, -1, Z_Operand_APT, z_AttributesPlusTerm},
     	{-1, -1, -1, Z_Operand_resultSetId, z_ResultSetId},
+    	{-1, -1, -1, Z_Operand_resultAttr, z_ResultSetPlusAttributes},
     	{-1, -1, -1, -1, 0}
     };
 
@@ -414,7 +601,7 @@ int z_Operand(ODR o, Z_Operand **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
@@ -422,7 +609,7 @@ int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
 int z_Complex(ODR o, Z_Complex **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_RPNStructure(o, &(*p)->s1, 0) &&
     	z_RPNStructure(o, &(*p)->s2, 0) &&
@@ -446,13 +633,13 @@ int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_RPNQuery(ODR o, Z_RPNQuery **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	odr_oid(o, &(*p)->attributeSetId, 0) &&
     	z_RPNStructure(o, &(*p)->RPNStructure, 0) &&
@@ -467,6 +654,7 @@ int z_Query(ODR o, Z_Query **p, int opt)
     {
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery},
     	{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
+    	{ODR_EXPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery},
     	{-1, -1, -1, -1, 0}
     };
 
@@ -477,7 +665,7 @@ int z_Query(ODR o, Z_Query **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
@@ -485,7 +673,7 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
     Z_SearchRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -505,8 +693,14 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
 	    ODR_CONTEXT, 100, 1) &&
 	odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
 	    ODR_CONTEXT, 101, 1) &&
-	z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
+	odr_implicit(o, odr_oid, &pp->preferredRecordSyntax,
+	    ODR_CONTEXT, 104, 1) &&
 	odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&
+#ifdef Z_95
+	odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
+	    ODR_CONTEXT, 203, 1) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
@@ -520,12 +714,19 @@ int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt)
 int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
-    	odr_oid(o, &(*p)->diagnosticSetId, 1) &&       /* SHOULD NOT BE OPT */
+    	odr_oid(o, &(*p)->diagnosticSetId, 1) && /* SHOULD NOT BE OPT! */
     	odr_integer(o, &(*p)->condition, 0) &&
+	/*
+	 * I no longer recall what server tagged the addinfo.. but it isn't
+	 * hurting anyone, so...
+	 * We need to turn it into a choice, or something, because of
+	 * that damn generalstring in v3.
+	 */
     	(odr_visiblestring(o, &(*p)->addinfo, 0) ||
-    	odr_implicit(o, odr_cstring, &(*p)->addinfo, ODR_CONTEXT, ODR_VISIBLESTRING, 1)) &&
+	    odr_implicit(o, odr_cstring, &(*p)->addinfo, ODR_CONTEXT,
+	    ODR_VISIBLESTRING, 1)) &&
     	odr_sequence_end(o);
 }
 
@@ -541,7 +742,7 @@ int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
     };
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
 	    0, 1) &&
@@ -578,7 +779,52 @@ int z_Records(ODR o, Z_Records **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
+}
+
+/* ------------------------ ACCESS CTRL SERVICE ----------------------- */
+
+int z_AccessControlRequest(ODR o, Z_AccessControlRequest **p, int opt)
+{
+    static Odr_arm arm[] = 
+    {
+	{ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm,
+	    odr_octetstring},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined,
+	    odr_external},
+    	{-1, -1, -1, -1, 0}
+    };
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
+int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt)
+{
+    static Odr_arm arm[] = 
+    {
+	{ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm,
+	    odr_octetstring},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined,
+	    odr_external},
+    	{-1, -1, -1, -1, 0}
+    };
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+	odr_explicit(o, z_DiagRec, &(*p)->diagnostic, ODR_CONTEXT, 223, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
 }
 
 /* ------------------------ SCAN SERVICE -------------------- */
@@ -595,7 +841,7 @@ int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
     	&(*p)->num_attributes))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 /*
@@ -611,7 +857,7 @@ int z_WillowAttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 4))
     {
     	o->t_class = -1;
-    	return opt;
+    	return opt && odr_ok(o);
     }
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 1))
     	return 0;
@@ -641,7 +887,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
     else if (!*p)
     {
     	o->t_class = -1;
-    	return opt;
+    	return opt && odr_ok(o);
     }
 
     if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
@@ -654,7 +900,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, 1, 1)&&
 	odr_explicit(o, odr_integer, &(*p)->global, ODR_CONTEXT, 2, 1) &&
@@ -664,7 +910,7 @@ int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	(willow_scan ? 
     	    odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :
@@ -695,7 +941,7 @@ int z_Entry(ODR o, Z_Entry **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_Entries(ODR o, Z_Entries **p, int opt)
@@ -742,13 +988,13 @@ int z_ListEntries(ODR o, Z_ListEntries **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
-    return opt && !o->error;
+    return opt && odr_ok(o);
 }
 
 int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     willow_scan = 0;
     return
     	z_ReferenceId(o, &(*p)->referenceId, 1) &&
@@ -770,7 +1016,7 @@ int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
 int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     return
     	z_ReferenceId(o, &(*p)->referenceId, 1) &&
 	odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 3, 1) &&
@@ -805,7 +1051,7 @@ int z_SearchResponse(ODR o, Z_SearchResponse **p, int opt)
     Z_SearchResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -813,20 +1059,115 @@ int z_SearchResponse(ODR o, Z_SearchResponse **p, int opt)
     	z_NumberOfRecordsReturned(o, &pp->numberOfRecordsReturned, 0) &&
     	z_NextResultSetPosition(o, &pp->nextResultSetPosition, 0) &&
     	odr_implicit(o, odr_bool, &pp->searchStatus, ODR_CONTEXT, 22, 0) &&
-    	odr_implicit(o, odr_integer, &pp->resultSetStatus, ODR_CONTEXT, 26, 1) &&
+    	odr_implicit(o, odr_integer, &pp->resultSetStatus, ODR_CONTEXT, 26,
+	    1) &&
     	z_PresentStatus(o, &pp->presentStatus, 1) &&
     	z_Records(o, &pp->records, 1) &&
+#ifdef Z_95
+	odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
+	    ODR_CONTEXT, 203, 1) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
 /* --------------------- PRESENT SERVICE ---------------------- */
 
+int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
+	    odr_visiblestring},
+	{ODR_IMPLICIT; ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
+	    odr_external},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (o->direction == ODR_DECODE)
+    	*p = odr_malloc(o, sizeof(**p));
+
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    	return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_Specification(ODR o, Z_Specification **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_oid, &(*p)->schema, ODR_CONTEXT, 1, 1) &&
+	z_ElementSpec(o, &(*p)->elementSpec, 1) &&
+	odr_sequence_end(o);
+}
+
+int z_DbSpecific(ODR o, Z_DbSpecific **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_explicit(o, z_DatabaseName, &(*p)->db, ODR_CONTEXT, 1, 0) &&
+	odr_implicit(o, z_Specification, &(*p)->spec, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
+int z_CompSpec(ODR o, Z_CompSpec **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_bool, &(*p)->selectAlternativeSyntax, ODR_CONTEXT,
+	    1, 0) &&
+	odr_implicit(o, z_Specification, &(*p)->generic, ODR_CONTEXT, 2, 1) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 3) &&
+	(odr_sequence_of(o, z_DbSpecific, &(*p)->num_dbSpecific,
+	    &(*p)->dbSpecific) || odr_ok(o)) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 4) &&
+	(odr_sequence_of(o, odr_oid, &(*p)->num_recordSyntax,
+	    &(*p)->recordSyntax) || odr_ok(o)) &&
+	odr_sequence_end(o);
+}
+
+int z_RecordComposition(ODR o, Z_RecordComposition **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_EXPLICIT, ODR_CONTEXT, 1, Z_RecordComp_simple,
+	    z_ElementSetNames},
+	{ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex,
+	    z_CompSpec},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (o->direction == ODR_DECODE)
+    	*p = odr_malloc(o, sizeof(**p));
+
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    	return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_Range(ODR o, Z_Range **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_integer, &(*p)->startingPosition, ODR_CONTEXT,
+	    1, 0) &&
+	odr_implicit(o, odr_integer, &(*p)->numberOfRecords, ODR_CONTEXT,
+	    2, 0) &&
+	odr_sequence_end(o);
+}
+
 int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt)
 {
     Z_PresentRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -835,8 +1176,25 @@ int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt)
 	    30, 0) &&
 	odr_implicit(o, odr_integer, &pp->numberOfRecordsRequested, ODR_CONTEXT,
 	    29, 0) &&
+#ifdef Z_95
+	odr_implicit_settag(o, ODR_CONTEXT, 212) &&
+	(odr_sequence_of(o, z_Range, &(*p)->num_ranges,
+	    &(*p)->additionalRanges) || odr_ok(o)) &&
+	z_RecordComposition(o, &(*p)->recordComposition, 1) &&
+#else
 	z_ElementSetNames(o, &pp->elementSetNames, 1) &&
-	z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
+#endif
+	odr_implicit(o, odr_oid, &(*p)->preferredRecordSyntax, ODR_CONTEXT,
+	    104, 1) &&
+#ifdef Z_95
+	odr_implicit(o, odr_integer, &(*p)->maxSegmentCount, ODR_CONTEXT,
+	    204, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->maxRecordSize, ODR_CONTEXT,
+	    206, 1) &&
+	odr_impplicit(o, odr_integer, &(*p)->maxSegmentSize, ODR_CONTEXT,
+	    207, 1) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
 	odr_sequence_end(o);
 }
 
@@ -845,7 +1203,7 @@ int z_PresentResponse(ODR o, Z_PresentResponse **p, int opt)
     Z_PresentResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
+    	return opt && odr_ok(o);
     pp = *p;
     return
     	z_ReferenceId(o, &pp->referenceId, 1) &&
@@ -853,9 +1211,107 @@ int z_PresentResponse(ODR o, Z_PresentResponse **p, int opt)
     	z_NextResultSetPosition(o, &pp->nextResultSetPosition, 0) &&
     	z_PresentStatus(o, &pp->presentStatus, 0) &&
     	z_Records(o, &pp->records, 1) &&
+#ifdef Z_95
+	Z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
     	odr_sequence_end(o);
 }
 
+/* ----------------------DELETE -------------------------- */
+
+int z_DeleteSetStatus(ODR o, int **p, int opt)
+{
+    return odr_implicit(o, odr_integer, p, ODR_CONTEXT, 33, opt);
+}
+
+int z_ListStatus(ODR o, Z_ListStatus **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ResultSetId(o, &(*p)->id, 0) &&
+	z_DeleteSetStatus(o, &(*p)->status, 0) &&
+	odr_sequence_end(o);
+}
+
+int z_DeleteResultSetRequest(ODR o, Z_DeleteResultSetRequest **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->deleteFunction, ODR_CONTEXT, 32,
+	    0) &&
+	(odr_sequence_of(o, z_ListStatus, &(*p)->resultSetList,
+	    &(*p)->num_ids) || odr_ok(o)) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
+int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, z_DeleteSetStatus, &(*p)->deleteOperationStatus,
+	    ODR_CONTEXT, 0, 1) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+	(odr_sequence_of(o, z_ListStatus, &(*p)->deleteListStatuses,
+	    &(*p)->num_statuses) || odr_ok(o)) &&
+	odr_implicit(o, odr_integer, &(*p)->numberNotDeleted, ODR_CONTEXT,
+	    34, 1) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 35) &&
+	(odr_sequence_of(o, z_ListStatus, &(*p)->bulkStatuses,
+	    &(*p)->num_bulkStatuses) || odr_ok(o)) &&
+	odr_implicit(o, odr_visiblestring, &(*p)->deleteMessage, ODR_CONTEXT,
+	    36, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
+/* ------------------------ SEGMENT SERVICE -------------- */
+
+int z_Segment(ODR o, Z_Segment **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->numberOfRecordsReturned,
+	    ODR_CONTEXT, 24, 0) &&
+	odr_implicit_settag(o, ODR_CONTEXT, 0) &&
+	odr_sequence_of(o, z_NamePlusRecord, &(*p)->num_segmentRecords,
+	    &(*p)->segmentRecords) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+	odr_sequence_end(o);
+}
+
+/* ------------------------ CLOSE SERVICE ---------------- */
+
+int z_Close(ODR o, Z_Close **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->closeReason, ODR_CONTEXT, 211, 0) &&
+	odr_implicit(o, odr_visiblestring, &(*p)->diagnosticInformation,
+	    ODR_CONTEXT, 3, 1) &&
+	odr_implicit(o, odr_oid, &(*p)->resourceReportFormat, ODR_CONTEXT,
+	    4, 1) &&
+	odr_implicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT,
+	    5, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
 /* ------------------------ APDU ------------------------- */
 
 int z_APDU(ODR o, Z_APDU **p, int opt)
@@ -871,6 +1327,10 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
 	    z_PresentRequest},
     	{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
 	    z_PresentResponse},
+	{ODR_IMPLICIT, ODR_CONTEXT, 26, Z_APDU_deleteResultSetRequest,
+	    z_DeleteResultSetRequest},
+	{ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
+	    z_DeleteResultSetResponse},
     	{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
 	    z_ResourceControlRequest},
     	{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
@@ -879,6 +1339,8 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
 	    z_TriggerResourceControlRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
+	{ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment},
+	{ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
 
     	{-1, -1, -1, -1, 0}
     };
@@ -889,7 +1351,7 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
     {
     	if (o->direction == ODR_DECODE)
 	    *p = 0;
-	return opt && !o->error;
+	return opt && odr_ok(o);
     }
     return 1;
 }