Fixed Makefile(s).

[yaz-moved-to-github.git] / odr / odr_use.c

diff --git a/odr/odr_use.c b/odr/odr_use.c
index 4d69073..25a178d 100644 (file)
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,10 +1,28 @@
 /*
- * 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: odr_use.c,v $
- * Revision 1.1  1995-02-03 17:04:39  quinn
+ * Revision 1.7  1995-09-29 17:12:27  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/08/10  08:54:47  quinn
+ * Added Explain.
+ *
+ * Revision 1.4  1995/06/16  13:16:12  quinn
+ * Fixed Defaultdiagformat.
+ *
+ * Revision 1.3  1995/05/16  08:51:00  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/02/09  15:51:50  quinn
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/03  17:04:39  quinn
  * Initial revision
  *
  */
@@ -15,7 +33,14 @@
 int odr_external(ODR o, Odr_external **p, int opt)
 {
     Odr_external *pp;
-    
+    static Odr_arm arm[] =
+    {
+       {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, odr_any},
+       {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, odr_octetstring},
+       {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, odr_bitstring},
+       {-1, -1, -1, -1, 0}
+    };
+
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
     if (!odr_sequence_begin(o, p, sizeof(Odr_external)))
        return opt;
@@ -24,8 +49,7 @@ int odr_external(ODR o, Odr_external **p, int opt)
        odr_oid(o, &pp->direct_reference, 1) &&
        odr_integer(o, &pp->indirect_reference, 1) &&
        odr_graphicstring(o, &pp->descriptor, 1) &&
-       odr_implicit(o, odr_octetstring, &pp->octet_aligned, ODR_CONTEXT,
-           1, 0) &&
+       odr_choice(o, arm, &pp->u, &pp->which) &&
        odr_sequence_end(o);
 }
 
@@ -35,8 +59,24 @@ int odr_visiblestring(ODR o, char **p, int opt)
        opt);
 }    
 
+/*
+ * a char may not be sufficient to hold a general string, but we'll deal
+ * with that once we start looking more closely at UniCode & co.
+ */
+int odr_generalstring(ODR o, char **p, int opt)
+{
+    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALSTRING,
+       opt);
+}    
+
 int odr_graphicstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
        opt);
 }    
+
+int odr_generalizedtime(ODR o, char **p, int opt)
+{
+    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALIZEDTIME,
+       opt);
+}