X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=a4df25e23bfb303b71b144b391bce8941a3a7e91;hb=113640450c45ca7ac96285cc8ca666bfd597ed21;hp=8883b04080328eeb9a49aa2c8e4c5a24c6c11af2;hpb=cb589c1cd95b040182aac4fb50d37bbf7107cde2;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 8883b04..a4df25e 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,41 @@
 /*
- * 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_choice.c,v $
- * Revision 1.4  1995-03-14 16:59:38  quinn
+ * Revision 1.14  1997-05-14 06:53:57  adam
+ * C++ support.
+ *
+ * Revision 1.13  1997/04/30 08:52:10  quinn
+ * Null
+ *
+ * Revision 1.12  1996/10/08  12:58:17  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * Revision 1.11  1995/09/29  17:12:23  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/08/15  12:00:23  quinn
+ * Updated External
+ *
+ * Revision 1.8  1995/06/19  17:01:51  quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.7  1995/06/19  13:06:50  quinn
+ * Fixed simple bug in the code to handle untagged choice elements.
+ *
+ * Revision 1.6  1995/05/16  08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/03/18  12:16:31  quinn
+ * Minor changes.
+ *
+ * Revision 1.4  1995/03/14  16:59:38  quinn
  * Added odr_constructed_more check
  *
  * Revision 1.3  1995/03/08  12:12:22  quinn
@@ -20,18 +51,23 @@
 
 #include <odr.h>
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 {
-    int i, cl = -1, tg, cn;
+    int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
 
     if (o->error)
     	return 0;
     if (o->direction != ODR_DECODE && !*(char**)p)
     	return 0;
+    o->choice_bias = -1;
     for (i = 0; arm[i].fun; i++)
     {
     	if (o->direction == ODR_DECODE)
+	{
+	    if (bias >= 0 && bias != arm[i].which)
+		continue;
     	    *which = arm[i].which;
+	}
 	else if (*which != arm[i].which)
 	    continue;
 
@@ -46,10 +82,10 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
 	    }
 	    else if (o->direction != ODR_DECODE)
 	    {
-	    	cl = arm[i].class;
+	    	cl = arm[i].zclass;
 	    	tg = arm[i].tag;
 	    }
-	    if (tg == arm[i].tag && cl == arm[i].class)
+	    if (tg == arm[i].tag && cl == arm[i].zclass)
 	    {
 	    	if (arm[i].tagmode == ODR_IMPLICIT)
 	    	{
@@ -64,10 +100,23 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
 	    }
 	}
 	else  /* no tagging. Have to poll type */
-	    if ((*arm[i].fun)(o, p, 0))
+	{
+	    if ((*arm[i].fun)(o, p, 1) && *(char**)p)
 	    	return 1;
+	}
     }
     *which = -1;
     *(char*)p = 0;
     return 0;
 }
+
+void odr_choice_bias(ODR o, int what)
+{
+    if (o->enable_bias)
+        o->choice_bias = what;
+}
+
+void odr_choice_enable_bias (ODR o, int mode)
+{
+    o->enable_bias = mode;
+}