Fixed Makefile(s).

[yaz-moved-to-github.git] / asn / prt-grs.c

diff --git a/asn/prt-grs.c b/asn/prt-grs.c
index 183ccc2..08c5ca6 100644 (file)
--- a/asn/prt-grs.c
+++ b/asn/prt-grs.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-grs.c,v $
- * Revision 1.1  1995-08-17 12:47:09  quinn
+ * Revision 1.6  1997-05-14 06:53:23  adam
+ * C++ support.
+ *
+ * Revision 1.5  1995/10/18 16:12:20  quinn
+ * Added a couple of special cases to handle the WAIS server.
+ *
+ * Revision 1.4  1995/09/29  17:11:55  quinn
+ * Smallish
+ *
+ * Revision 1.3  1995/09/27  15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/08/28  10:58:58  quinn
+ * Added extra choice-entry to data to catch visiblestring.
+ *
+ * Revision 1.1  1995/08/17  12:47:09  quinn
  * Added GRS-1.
  *
  *
@@ -12,7 +27,6 @@
 
 #include <proto.h>
 
-int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
 int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt);
 int z_ElementData(ODR o, Z_ElementData **p, int opt);
 int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt);
@@ -59,6 +73,8 @@ int z_ElementData(ODR o, Z_ElementData **p, int opt)
        {ODR_NONE, -1, -1, Z_ElementData_date, odr_generalizedtime},
        {ODR_NONE, -1, -1, Z_ElementData_ext, z_External},
        {ODR_NONE, -1, -1, Z_ElementData_string, z_InternationalString},
+       /* The entry below provides some backwards compatibility */
+       {ODR_NONE, -1, -1, Z_ElementData_string, odr_visiblestring},
        {ODR_NONE, -1, -1, Z_ElementData_trueOrFalse, odr_bool},
        {ODR_NONE, -1, -1, Z_ElementData_oid, odr_oid},
        {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit, z_IntUnit},
@@ -169,6 +185,8 @@ int z_Triple(ODR o, Z_Triple **p, int opt)
     {
        {ODR_NONE, -1, -1, Z_Triple_integer, odr_integer},
        {ODR_NONE, -1, -1, Z_Triple_internationalString, z_InternationalString},
+       /* The entry below provides some backwards compatibility */
+       {ODR_NONE, -1, -1, Z_Triple_internationalString, odr_visiblestring},
        {ODR_NONE, -1, -1, Z_Triple_octetString, odr_octetstring},
        {ODR_NONE, -1, -1, Z_Triple_oid, odr_oid},
        {ODR_NONE, -1, -1, Z_Triple_boolean, odr_bool},
@@ -182,7 +200,7 @@ int z_Triple(ODR o, Z_Triple **p, int opt)
        return opt && odr_ok(o);
     return
        odr_implicit(o, odr_oid, &(*p)->variantSetId, ODR_CONTEXT, 0, 1) &&
-       odr_implicit(o, odr_integer, &(*p)->class, ODR_CONTEXT, 1, 0) &&
+       odr_implicit(o, odr_integer, &(*p)->zclass, ODR_CONTEXT, 1, 0) &&
        odr_implicit(o, odr_integer, &(*p)->type, ODR_CONTEXT, 2, 0) &&
        odr_constructed_begin(o, &(*p)->value, ODR_CONTEXT, 3) &&
        odr_choice(o, arm, &(*p)->value, &(*p)->which) &&