X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-esp.c;h=f731a806d1d23c40d096d22e7b0cb14f1abab5ca;hp=bc11d725454d818617c240a8a4c62034d718eab1;hb=006c3df264a95c03bfc557b2004595fc6cc3ee14;hpb=0ba153ff51508cf37d3f5bbc48e3738dacfc6f42

diff --git a/asn/prt-esp.c b/asn/prt-esp.c
index bc11d72..f731a80 100644
--- a/asn/prt-esp.c
+++ b/asn/prt-esp.c
@@ -1,20 +1,34 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-esp.c,v $
- * Revision 1.1  1995-10-12 10:34:37  quinn
+ * Revision 1.5  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.4  1999/04/20 09:56:47  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.3  1998/02/11 11:53:32  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2  1998/02/10 15:31:46  adam
+ * Implemented date and time structure. Changed the Update Extended
+ * Service.
+ *
+ * Revision 1.1  1995/10/12 10:34:37  quinn
  * Added Espec-1.
  *
  *
  */
 
-#include <proto.h>
+#include <yaz/proto.h>
 
-int z_OccurValues(ODR o, Z_OccurValues **p, int opt)
+int z_OccurValues(ODR o, Z_OccurValues **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
 	return opt && odr_ok(o);
     return
     	odr_implicit(o, odr_integer, &(*p)->start, ODR_CONTEXT, 1, 0) &&
@@ -22,165 +36,176 @@ int z_OccurValues(ODR o, Z_OccurValues **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_Occurrences(ODR o, Z_Occurrences **p, int opt)
+int z_Occurrences(ODR o, Z_Occurrences **p, int opt, const char *name)
 {
     static Odr_arm arm[] =
     {
-	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Occurrences_all, odr_null},
-	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Occurrences_last, odr_null},
-	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Occurrences_values, z_OccurValues},
-	{-1, -1, -1, -1, 0}
+	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Occurrences_all,
+	 (Odr_fun)odr_null, 0},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Occurrences_last,
+	 (Odr_fun)odr_null, 0},
+	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Occurrences_values,
+	 (Odr_fun)z_OccurValues, 0},
+	{-1, -1, -1, -1, 0, 0}
     };
-
+    
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_Occurrences *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
-    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_SpecificTag(ODR o, Z_SpecificTag **p, int opt)
+int z_SpecificTag(ODR o, Z_SpecificTag **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
 	return opt && odr_ok(o);
     return
+        odr_implicit(o, odr_oid, &(*p)->schemaId, ODR_CONTEXT, 0, 1) &&
         odr_implicit(o, odr_integer, &(*p)->tagType, ODR_CONTEXT, 1, 1) &&
 	odr_explicit(o, z_StringOrNumeric, &(*p)->tagValue, ODR_CONTEXT,
-	    2, 0) &&
-	odr_explicit(o, z_Occurrences, &(*p)->occurrences, ODR_CONTEXT, 3, 1) &&
+		     2, 0) &&
+	odr_explicit(o, z_Occurrences, &(*p)->occurrences,
+		     ODR_CONTEXT, 3, 1) &&
 	odr_sequence_end(o);
 }
 
-int z_ETagUnit(ODR o, Z_ETagUnit **p, int opt)
+int z_ETagUnit(ODR o, Z_ETagUnit **p, int opt, const char *name)
 {
     static Odr_arm arm[] =
     {
-	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ETagUnit_specificTag, z_SpecificTag},
-	{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ETagUnit_wildThing, z_Occurrences},
-	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ETagUnit_wildPath, odr_null},
-	{-1, -1, -1 -1, 0}
+	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ETagUnit_specificTag,
+	 (Odr_fun)z_SpecificTag, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ETagUnit_wildThing,
+	 (Odr_fun)z_Occurrences, 0},
+	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ETagUnit_wildPath,
+	 (Odr_fun)odr_null, 0},
+	{-1, -1, -1 -1, 0, 0}
     };
-
+    
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_ETagUnit *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
-    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_ETagPath(ODR o, Z_ETagPath **p, int opt)
+int z_ETagPath(ODR o, Z_ETagPath **p, int opt, const char *name)
 {
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_ETagPath *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
-    if (odr_sequence_of(o, z_ETagUnit, &(*p)->tags, &(*p)->num_tags))
+    if (odr_sequence_of(o, (Odr_fun)z_ETagUnit, &(*p)->tags,
+			&(*p)->num_tags, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_SimpleElement(ODR o, Z_SimpleElement **p, int opt)
+int z_SimpleElement(ODR o, Z_SimpleElement **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
 	return opt && odr_ok(o);
     return
     	odr_implicit(o, z_ETagPath, &(*p)->path, ODR_CONTEXT, 1, 0) &&
-	odr_implicit(o, z_Variant, &(*p)->variantRequest, ODR_CONTEXT,
-	    2, 1) &&
+	odr_implicit(o, z_Variant, &(*p)->variantRequest,
+		     ODR_CONTEXT, 2, 1) &&
 	odr_sequence_end(o);
 }
 
-int z_CompoPrimitives(ODR o, Z_CompoPrimitives **p, int opt)
+int z_CompoPrimitives(ODR o, Z_CompoPrimitives **p, int opt, const char *name)
 {
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_CompoPrimitives *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
     if (odr_sequence_of(o, z_InternationalString, &(*p)->primitives,
-	&(*p)->num_primitives))
+			&(*p)->num_primitives, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_CompoSpecs(ODR o, Z_CompoSpecs **p, int opt)
+int z_CompoSpecs(ODR o, Z_CompoSpecs **p, int opt, const char *name)
 {
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_CompoSpecs *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
-    if (odr_sequence_of(o, z_SimpleElement, &(*p)->specs, &(*p)->num_specs))
+    if (odr_sequence_of(o, (Odr_fun)z_SimpleElement, &(*p)->specs,
+			&(*p)->num_specs, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_CompositeElement(ODR o, Z_CompositeElement **p, int opt)
+int z_CompositeElement(ODR o, Z_CompositeElement **p, int opt,
+		       const char *name)
 {
     static Odr_arm arm[] =
     {
 	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_CompoElement_primitives,
-	    z_CompoPrimitives},
+	 (Odr_fun)z_CompoPrimitives, 0},
 	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_CompoElement_specs,
-	    z_CompoSpecs},
-	{-1, -1, -1, -1, 0}
+	 (Odr_fun)z_CompoSpecs, 0},
+	{-1, -1, -1, -1, 0, 0}
     };
-
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
 	return opt && odr_ok(o);
     return
-        odr_constructed_begin(o, &(*p)->elementList, ODR_CONTEXT, 1) &&
-	odr_choice(o, arm, &(*p)->elementList, &(*p)->which) &&
+        odr_constructed_begin(o, &(*p)->elementList, ODR_CONTEXT, 1, 0) &&
+	odr_choice(o, arm, &(*p)->elementList, &(*p)->which, 0) &&
 	odr_constructed_end(o) &&
 	odr_implicit(o, z_ETagPath, &(*p)->deliveryTag, ODR_CONTEXT, 2, 0) &&
 	odr_implicit(o, z_Variant, &(*p)->variantRequest, ODR_CONTEXT, 3, 1) &&
 	odr_sequence_end(o);
 }
 
-int z_ElementRequest(ODR o, Z_ElementRequest **p, int opt)
+int z_ElementRequest(ODR o, Z_ElementRequest **p, int opt, const char *name)
 {
     static Odr_arm arm[] =
     {
 	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ERequest_simpleElement,
-	    z_SimpleElement},
+	 (Odr_fun)z_SimpleElement, 0},
 	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ERequest_compositeElement,
-	    z_CompositeElement},
-	{-1, -1, -1 -1, 0}
+	 (Odr_fun)z_CompositeElement, 0},
+	{-1, -1, -1 -1, 0, 0}
     };
-
+    
     if (o->direction == ODR_DECODE)
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_ElementRequest *)odr_malloc(o, sizeof(**p));
     else if (!*p)
 	return opt;
-    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which, 0))
 	return 1;
     *p = 0;
     return opt && odr_ok(o);
 }
 
-int z_Espec1(ODR o, Z_Espec1 **p, int opt)
+int z_Espec1(ODR o, Z_Espec1 **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
 	return opt && odr_ok(o);
     return
         odr_implicit_settag(o, ODR_CONTEXT, 1) &&
 	(odr_sequence_of(o, z_InternationalString, &(*p)->elementSetNames,
-	    &(*p)->num_elementSetNames) || odr_ok(o)) &&
-	odr_implicit(o, odr_oid, &(*p)->defaultVariantSetId, ODR_CONTEXT,
-	    2, 1) &&
-	odr_implicit(o, z_Variant, &(*p)->defaultVariantRequest, ODR_CONTEXT,
-	    3, 1) &&
-	odr_implicit(o, odr_integer, &(*p)->defaultTagType, ODR_CONTEXT,
-	    4, 1) &&
+			 &(*p)->num_elementSetNames, 0) || odr_ok(o)) &&
+	odr_implicit(o, odr_oid, &(*p)->defaultVariantSetId,
+		     ODR_CONTEXT, 2, 1) &&
+	odr_implicit(o, z_Variant, &(*p)->defaultVariantRequest,
+		     ODR_CONTEXT, 3, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->defaultTagType,
+		     ODR_CONTEXT, 4, 1) &&
 	odr_implicit_settag(o, ODR_CONTEXT, 5) &&
-	(odr_sequence_of(o, z_ElementRequest, &(*p)->elements,
-	    &(*p)->num_elements) || odr_ok(o)) &&
+	(odr_sequence_of(o, (Odr_fun)z_ElementRequest, &(*p)->elements,
+			 &(*p)->num_elements, 0) || odr_ok(o)) &&
 	odr_sequence_end(o);
 }