X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-ext.c;h=27d8db98c7868fe7a1ee1f5e36c09ec33f332dff;hp=f9feee8e5d9989c70ec84602b583f7c3f8680137;hb=ab66367f19b935a874d190bbe5b5d8f20dbf3592;hpb=297a057b70eb2747f46b5fe216984394cde6ea8b

diff --git a/asn/prt-ext.c b/asn/prt-ext.c
index f9feee8..27d8db9 100644
--- a/asn/prt-ext.c
+++ b/asn/prt-ext.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-ext.c,v $
- * Revision 1.7  1995-10-12 10:34:38  quinn
+ * Revision 1.8  1996-02-20 12:51:44  quinn
+ * Completed SCAN. Fixed problems with EXTERNAL.
+ *
+ * Revision 1.7  1995/10/12  10:34:38  quinn
  * Added Espec-1.
  *
  * Revision 1.6  1995/09/29  17:11:55  quinn
@@ -30,9 +33,40 @@
 
 #include <proto.h>
 
+/*
+ * The table below should be moved to the ODR structure itself and
+ * be an image of the association context: To help
+ * map indirect references when they show up. 
+ */
+static Z_ext_typeent type_table[] =
+{
+    {VAL_SUTRS, Z_External_sutrs, z_SUTRS},
+    {VAL_EXPLAIN, Z_External_explainRecord, z_ExplainRecord},
+    {VAL_RESOURCE1, Z_External_resourceReport1, z_ResourceReport1},
+    {VAL_RESOURCE2, Z_External_resourceReport2, z_ResourceReport2},
+    {VAL_PROMPT1, Z_External_promptObject1, z_PromptObject1 },
+    {VAL_GRS1, Z_External_grs1, z_GenericRecord},
+    {VAL_EXTENDED, Z_External_extendedService, z_TaskPackage},
+    {VAL_ITEMORDER, Z_External_itemOrder, z_ItemOrder},
+    {VAL_DIAG1, Z_External_diag1, z_DiagnosticFormat},
+    {VAL_ESPEC1, Z_External_espec1, z_Espec1},
+    {VAL_NONE, 0, 0}
+};
+
+Z_ext_typeent *z_ext_getentbyref(oid_value val)
+{
+    Z_ext_typeent *i;
+
+    for (i = type_table; i->dref != VAL_NONE; i++)
+	if (i->dref == val)
+	    return i;
+    return 0;
+}
+
 int z_External(ODR o, Z_External **p, int opt)
 {
-   oident *oid;
+    oident *oid;
+    Z_ext_typeent *type;
 
     static Odr_arm arm[] =
     {
@@ -57,29 +91,6 @@ int z_External(ODR o, Z_External **p, int opt)
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, z_Espec1},
 	{-1, -1, -1, -1, 0}
     };
-    /*
-     * The table below should be moved to the ODR structure itself and
-     * be an image of the association context: To help
-     * map indirect references when they show up. 
-     */
-    static struct
-    {
-	oid_value dref;
-	int what;          /* discriminator value for the external CHOICE */
-    } tab[] =
-    {
-    	{VAL_SUTRS, Z_External_sutrs},
-	{VAL_EXPLAIN, Z_External_explainRecord},
-	{VAL_RESOURCE1, Z_External_resourceReport1},
-	{VAL_RESOURCE2, Z_External_resourceReport2},
-	{VAL_PROMPT1, Z_External_promptObject1},
-	{VAL_GRS1, Z_External_grs1},
-	{VAL_EXTENDED, Z_External_extendedService},
-	{VAL_ITEMORDER, Z_External_itemOrder},
-	{VAL_DIAG1, Z_External_diag1},
-	{VAL_ESPEC1, Z_External_espec1},
-	{VAL_NONE, 0}
-    };
 
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -92,16 +103,18 @@ int z_External(ODR o, Z_External **p, int opt)
      * Do we know this beast?
      */
     if (o->direction == ODR_DECODE && (*p)->direct_reference &&
-	(oid = oid_getentbyoid((*p)->direct_reference)))
+	(oid = oid_getentbyoid((*p)->direct_reference)) &&
+	(type = z_ext_getentbyref(oid->value)))
     {
-	int i;
+	int class, tag, cons;
 
-	for (i = 0; tab[i].dref != VAL_NONE; i++)
-	    if (oid->value == tab[i].dref)
-	    {
-		odr_choice_bias(o, tab[i].what);
-		break;
-	    }
+	/*
+	 * We know it. If it's represented as an ASN.1 type, bias the CHOICE.
+	 */
+	if (!odr_peektag(o, &class, &tag, &cons))
+	    return opt && odr_ok(o);
+	if (class == ODR_CONTEXT && tag == 0 && cons == 1)
+	    odr_choice_bias(o, type->what);
     }
     return
 	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&