Fixed bugs in the bitmask operations

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

diff --git a/odr/test.c b/odr/test.c
index 16f7c44..013eefb 100644 (file)
--- a/odr/test.c
+++ b/odr/test.c
@@ -1,63 +1,166 @@
 #include <stdio.h>
-
 #include <odr.h>
+#include <odr_use.h>
+
+#if 0
 
-int odr_dummy(ODR o, int **p, int opt)
+typedef Odr_bitmask Z_ReferenceId;
+
+typedef struct Z_InitRequest
 {
-    return odr_implicit(o, odr_integer, p, ODR_PRIVATE, 10, opt);
-}
+    Z_ReferenceId *referenceId;    /* OPTIONAL */
+    Odr_bitmask *options;
+    Odr_bitmask *protocolVersion;
+    int *preferredMessageSize;
+    int *maximumRecordSize;
+    char *idAuthentication;      /* OPTIONAL */
+    char *implementationId;      /* OPTIONAL */
+    char *implementationName;    /* OPTIONAL */
+    char *implementationVersion; /* OPTIONAL */
+} Z_InitRequest;
 
-struct dummy
+int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt)
 {
-    int *alfa;
-    int *beta;
-};
+    return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
+}
 
-int odr_dummy2(ODR o, struct dummy **p, int opt)
+int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 {
-    struct dummy *pp;
+    Z_InitRequest *pp;
 
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(Z_InitRequest)))
        return opt;
     pp = *p;
     return
-       odr_implicit(o, odr_integer, &pp->alfa, ODR_CONTEXT, 1, 1) &&
-       odr_implicit(o, odr_integer, &pp->beta, ODR_CONTEXT, 2, 1) &&
-       odr_sequence_end(o);
+       z_ReferenceId(o, &pp->referenceId, 1) &&
+       odr_implicit(o, odr_bitstring, &pp->protocolVersion, ODR_CONTEXT, 
+           3, 0) &&
+       odr_implicit(o, odr_bitstring, &pp->options, ODR_CONTEXT, 4, 0) &&
+       odr_implicit(o, odr_integer, &pp->preferredMessageSize, ODR_CONTEXT,
+           5, 0) &&
+       odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
+           6, 0) &&
+       odr_implicit(o, odr_visiblestring, &pp->idAuthentication, ODR_CONTEXT,
+           7, 1) &&
+       odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
+           110, 1) &&
+       odr_implicit(o, odr_visiblestring, &pp->implementationName, ODR_CONTEXT,
+           111, 1) &&
+       odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
+           ODR_CONTEXT, 112, 1) &&
+       odr_sequence_end(o);
+}
+
+struct A
+{
+    int which;
+    union
+    {
+       int *b;   /* integer */
+       char *c;  /* visstring */
+    } u;
+};
+
+int f_A(ODR o, struct A **p, int opt)
+{
+    int res;
+    Odr_arm arm[] =
+    {
+       { -1, -1, -1, 0, (Odr_fun) odr_integer },
+       { ODR_IMPLICIT, ODR_CONTEXT, 200, 1, (Odr_fun) odr_visiblestring },
+       { -1, -1, -1, -1, 0 }
+    };
+
+    if (o->direction == ODR_DECODE && !*p)
+       *p = odr_malloc(o, sizeof(**p));
+    res = odr_choice(o, arm, &(*p)->u, &(*p)->which);
+    if (!res)
+    {
+       *p = 0;
+       return opt;
+    }
+    return 1;
 }
 
+#if 0
 int main()
 {
     int i;
-    unsigned char buf[1024];
+    unsigned char buf[4048];
     struct odr o;
-    int test=-99999;
-    int *tp = &test, *tp2;
-    ODR_OCT bbb, *bbb1, *bbb2;
-    ODR_OCT ccc, *ccc1;
-    char *str1 = "FOO", *str2 = "BAR";
+    Z_InitRequest ireq, *ireqp, *ireq2p;
+    Odr_bitmask options, protocolVersion;
+    char *iId = "YAZ", *iName = "Yet Another Z39.50 Implementation",
+       *iVersion = "0.1";
+    int maximumRS = 4096, preferredMS = 2048;
+    static Odr_oid oid[] = {1, 2, 3, 4, -1}, *oidp1, *oidp2;
+
+    oidp1 = oid;
+
+    ODR_MASK_ZERO(&protocolVersion);
+    ODR_MASK_SET(&protocolVersion, 0);
+    ODR_MASK_SET(&protocolVersion, 1);
+
+    ODR_MASK_ZERO(&options);
+    ODR_MASK_SET(&options, 0);
+    ODR_MASK_SET(&options, 1);
+    ODR_MASK_SET(&options, 2);
+
+    ireq.referenceId = 0;
+    ireq.protocolVersion = &protocolVersion;
+    ireq.options = &options;
+    ireq.preferredMessageSize = &preferredMS;
+    ireq.maximumRecordSize = &maximumRS;
+    ireq.idAuthentication = 0;
+    ireq.implementationId = iId;
+    ireq.implementationName = iName;
+    ireq.implementationVersion = iVersion;
+    ireqp = &ireq;
 
     o.buf = buf;
     o.bp=o.buf;
     o.left = o.buflen = 1024;
-    o.direction = ODR_ENCODE;
+    o.direction = ODR_PRINT;
+    o.print = stdout;
     o.t_class = -1;
 
-    bbb.buf = (unsigned char *) str1;
-    bbb.len = bbb.size = strlen(str1);
-    bbb1 = &bbb;
-
-    ccc.buf = (unsigned char*) str2;
-    ccc.len = ccc.size = strlen(str2);
-    ccc1 = &ccc;
+    odr_oid(&o, &oidp1, 0);
 
-    odr_constructed_begin(&o, &bbb1, ODR_UNIVERSAL, ODR_OCTETSTRING, 0);
-    odr_octetstring(&o, &bbb1, 0);
-    odr_octetstring(&o, &ccc1, 0);
-    odr_constructed_end(&o);
+    exit(0);
 
     o.direction = ODR_DECODE;
     o.bp = o.buf;
 
-    odr_octetstring(&o, &bbb2, 0);
+    odr_oid(&o, &oidp2, 0);
 }    
+#endif
+
+#endif
+
+int main()
+{
+    Odr_bitmask a;
+    char command;
+    int val;
+    char line[100];
+
+    ODR_MASK_ZERO(&a);
+    while (gets(line))
+    {
+       int i;
+
+       sscanf(line, "%c %d", &command, &val);
+       switch (command)
+       {
+           case 's': ODR_MASK_SET(&a, val); break;
+           case 'c': ODR_MASK_CLEAR(&a, val); break;
+           case 'g': printf("%d\n", ODR_MASK_GET(&a, val)); break;
+           case 'l': break;
+           default: printf("enter c <v> or s <v> or l\n"); continue;
+       }
+       printf("top is %d\n", a.top);
+       for (i = 0; i <= a.top; i++)
+           printf("%2.2x ", a.bits[i] );
+       printf("\n");
+     }
+}