X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_use.c;h=918d69d0a99f165483a49a2d645638fec8c39b59;hp=4d69073ea0772d5fdde0f0e0824c93c6be353c3f;hb=ec1f815d5348cd21e393f76bc212c910c34bbc45;hpb=82c1521f196b83c0ede4200b21eb25ed86bbf48e

diff --git a/odr/odr_use.c b/odr/odr_use.c
index 4d69073..918d69d 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,42 +1,66 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, 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
- * Initial revision
- *
+ * $Id: odr_use.c,v 1.14 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <odr_use.h>
+#include "odr-priv.h"
 
-int odr_external(ODR o, Odr_external **p, int opt)
+int odr_external(ODR o, Odr_external **p, int opt, const char *name)
 {
     Odr_external *pp;
-    
+    static Odr_arm arm[] =
+    {
+    	{ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, 
+	 (Odr_fun)odr_any, "single"},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet,
+	 (Odr_fun)odr_octetstring, "octet"},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary,
+	 (Odr_fun)odr_bitstring, "arbitrary"},
+    	{-1, -1, -1, -1, 0, 0}
+    };
+
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
-    if (!odr_sequence_begin(o, p, sizeof(Odr_external)))
-    	return opt;
+    if (!odr_sequence_begin(o, p, sizeof(Odr_external), name))
+    	return odr_missing(o, opt, name);
     pp = *p;
     return
-    	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_oid(o, &pp->direct_reference, 1, "direct") &&
+    	odr_integer(o, &pp->indirect_reference, 1, "indirect") &&
+    	odr_graphicstring(o, &pp->descriptor, 1, "descriptor") &&
+    	odr_choice(o, arm, &pp->u, &pp->which, 0) &&
 	odr_sequence_end(o);
 }
 
-int odr_visiblestring(ODR o, char **p, int opt)
+int odr_visiblestring(ODR o, char **p, int opt, const char *name)
+{
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			    ODR_VISIBLESTRING, opt, name);
+}    
+
+/*
+ * 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, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_VISIBLESTRING,
-    	opt);
+    return odr_implicit_tag(o, odr_iconv_string, p, ODR_UNIVERSAL,
+			    ODR_GENERALSTRING,opt, name);
 }    
 
-int odr_graphicstring(ODR o, char **p, int opt)
+int odr_graphicstring(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
-    	opt);
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			ODR_GRAPHICSTRING, opt, name);
 }    
+
+int odr_generalizedtime(ODR o, char **p, int opt, const char *name)
+{
+    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+			    ODR_GENERALIZEDTIME, opt, name);
+}