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

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 9f5ef30..d752714 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,46 +1,49 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_choice.c,v $
- * 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
- * Works better now.
- *
- * Revision 1.1  1995/02/07  17:52:59  quinn
- * A damn mess, but now things work, I think.
- *
+ * $Id: odr_choice.c,v 1.20 2002-07-25 12:51:08 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
+	       const char *name)
 {
-    int i, cl = -1, tg, cn, *which = whichp;
+    int i, cl = -1, tg, cn, *which = (int *)whichp, bias = o->choice_bias;
 
     if (o->error)
     	return 0;
     if (o->direction != ODR_DECODE && !*(char**)p)
     	return 0;
+
+    if (o->direction == ODR_DECODE)
+    {
+        *which = -1;
+        *(char**)p = 0;
+    }
+    o->choice_bias = -1;
+
+    if (o->direction == ODR_PRINT)
+    {
+	if (name)
+	{
+	    odr_prname(o, name);
+	    fprintf (o->print, "choice\n");
+	}
+    }
     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;
 
@@ -48,37 +51,46 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
     	{
 	    if (o->direction == ODR_DECODE && cl < 0)
 	    {
-	    	if (o->stackp > -1 && !odr_constructed_more(o))
+	    	if (o->op->stackp > -1 && !odr_constructed_more(o))
 		    return 0;
 	    	if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
 		    return 0;
 	    }
 	    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)
 	    	{
 		    odr_implicit_settag(o, cl, tg);
-	    	    return (*arm[i].fun)(o, p, 0);
+	    	    return (*arm[i].fun)(o, (char **)p, 0, arm[i].name);
 		}
 		/* explicit */
-		if (!odr_constructed_begin(o, p, cl, tg))
+		if (!odr_constructed_begin(o, p, cl, tg, 0))
 		    return 0;
-		return (*arm[i].fun)(o, p, 0) &&
+		return (*arm[i].fun)(o, (char **)p, 0, arm[i].name) &&
 		    odr_constructed_end(o);
 	    }
 	}
 	else  /* no tagging. Have to poll type */
 	{
-	    if ((*arm[i].fun)(o, p, 1) && *(char*)p)
+	    if ((*arm[i].fun)(o, (char **)p, 1, arm[i].name) && *(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;
+}