X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_choice.c;h=945e4fe8100a36471b005d9fd3dac934cbbe8e5a;hp=8faf925dec8595cc9c87ac1a39c98fd643d108b8;hb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 8faf925..945e4fe 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,31 @@
 /*
- * 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.3  1995-03-08 12:12:22  quinn
+ * 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
  * Added better error checking.
  *
  * Revision 1.2  1995/02/09  15:51:48  quinn
@@ -17,18 +38,23 @@
 
 #include <odr.h>
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
+int MDF 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;
 
@@ -36,6 +62,8 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
     	{
 	    if (o->direction == ODR_DECODE && cl < 0)
 	    {
+	    	if (o->stackp > -1 && !odr_constructed_more(o))
+		    return 0;
 	    	if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
 		    return 0;
 	    }
@@ -59,10 +87,17 @@ 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 MDF odr_choice_bias(ODR o, int what)
+{
+    o->choice_bias = what;
+}