X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=59beae4be3c34dc9288d33e7d1c3538b49dd0646;hb=fc89703038b1168a8f52b6920c50dedb9080063d;hp=9f5ef30973d04db94662604c26127b9b361c4c34;hpb=e31a14058cffd70c2d65a6f599e216e0bcddf7b7;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 9f5ef30..59beae4 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.7  1995-06-19 13:06:50  quinn
+ * 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
@@ -31,16 +43,21 @@
 
 int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 {
-    int i, cl = -1, tg, cn, *which = whichp;
+    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;
 
@@ -74,7 +91,7 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 	}
 	else  /* no tagging. Have to poll type */
 	{
-	    if ((*arm[i].fun)(o, p, 1) && *(char*)p)
+	    if ((*arm[i].fun)(o, p, 1) && *(char**)p)
 	    	return 1;
 	}
     }
@@ -82,3 +99,8 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
     *(char*)p = 0;
     return 0;
 }
+
+void odr_choice_bias(ODR o, int what)
+{
+    o->choice_bias = what;
+}