Fix sample PQF

[yaz-moved-to-github.git] / odr / odr_choice.c

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index f54711a..51f6b2f 100644 (file)
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,29 +1,49 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_choice.c,v $
- * 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.22 2003-03-11 11:03:31 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, int *which)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
+              const char *name)
 {
-    int i, cl = -1, tg, cn;
+    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;
 
@@ -31,33 +51,46 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
        {
            if (o->direction == ODR_DECODE && cl < 0)
            {
-               if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
+               if (o->op->stackp > -1 && !odr_constructed_more(o))
+                   return 0;
+               if (ber_dectag(o->bp, &cl, &tg, &cn, odr_max(o)) <= 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, 0))
+       {
+           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;
+}