X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fyaz-ccl.c;h=436d048584a8b472922eecfeeb9bbfc7485fce2f;hp=5bf800677ada1a179f6978c9b527deaa9498c196;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=5e2a2c9901994e4e772a499d5fc03c9d044ca80a

diff --git a/util/yaz-ccl.c b/util/yaz-ccl.c
index 5bf8006..436d048 100644
--- a/util/yaz-ccl.c
+++ b/util/yaz-ccl.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1996-1997, Index Data.
+ * Copyright (c) 1996-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-ccl.c,v $
- * Revision 1.10  1997-09-29 08:58:25  adam
+ * Revision 1.13  1998-03-31 15:13:20  adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.12  1998/02/11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11  1997/11/24 11:33:57  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.10  1997/09/29 08:58:25  adam
  * Fixed conversion of trees so that true copy is made.
  *
  * Revision 1.9  1997/06/23 10:31:25  adam
@@ -31,47 +41,55 @@ static Z_AttributesPlusTerm *ccl_rpn_term (ODR o, struct ccl_rpn_node *p)
     Z_AttributesPlusTerm *zapt;
     Odr_oct *term_octet;
     Z_Term *term;
+    Z_AttributeElement **elements;
 
-    zapt = odr_malloc (o, sizeof(*zapt));
+    zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
     assert (zapt);
 
-    term_octet = odr_malloc (o, sizeof(*term_octet));
+    term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
     assert (term_octet);
 
-    term = odr_malloc (o, sizeof(*term));
+    term = (Z_Term *)odr_malloc (o, sizeof(*term));
     assert(term);
 
     for (attr = p->u.t.attr_list; attr; attr = attr->next)
         num++;
-    zapt->num_attributes = num;
-    if (num)
+    if (!num)
+        elements = (Z_AttributeElement**)odr_nullval();
+    else
     {
         int i = 0;
-        zapt->attributeList = odr_malloc (o, num*sizeof(*zapt->attributeList));
-        assert (zapt->attributeList);
+	elements = (Z_AttributeElement **)
+	    odr_malloc (o, num*sizeof(*elements));
         for (attr = p->u.t.attr_list; attr; attr = attr->next, i++)
         {
-            zapt->attributeList[i] =
-		odr_malloc (o, sizeof(**zapt->attributeList));
-            assert (zapt->attributeList[i]);
-            zapt->attributeList[i]->attributeType =
-		odr_malloc(o, sizeof(int));
-            *zapt->attributeList[i]->attributeType = attr->type;
-	    zapt->attributeList[i]->attributeSet = 0;
-	    zapt->attributeList[i]->which = Z_AttributeValue_numeric;
-	    zapt->attributeList[i]->value.numeric =
-		odr_malloc (o, sizeof(int));
-	    *zapt->attributeList[i]->value.numeric = attr->value;
+            elements[i] = (Z_AttributeElement *)
+		odr_malloc (o, sizeof(**elements));
+            assert (elements[i]);
+            elements[i]->attributeType =
+		(int *)odr_malloc(o, sizeof(int));
+            *elements[i]->attributeType = attr->type;
+	    elements[i]->attributeSet = 0;
+	    elements[i]->which = Z_AttributeValue_numeric;
+	    elements[i]->value.numeric =
+		(int *)odr_malloc (o, sizeof(int));
+	    *elements[i]->value.numeric = attr->value;
         }
     }
-    else
-        zapt->attributeList = ODR_NULLVAL;
-    
+#ifdef ASN_COMPILED
+    zapt->attributes = (Z_AttributeList *)
+	odr_malloc (o, sizeof(*zapt->attributes));
+    zapt->attributes->num_attributes = num;
+    zapt->attributes->attributes = elements;
+#else
+    zapt->num_attributes = num;
+    zapt->attributeList = elements;
+#endif    
     zapt->term = term;
     term->which = Z_Term_general;
     term->u.general = term_octet;
     term_octet->len = term_octet->size = strlen (p->u.t.term);
-    term_octet->buf = odr_malloc (o, term_octet->len+1);
+    term_octet->buf = (unsigned char *)odr_malloc (o, term_octet->len+1);
     strcpy ((char*) term_octet->buf, p->u.t.term);
     return zapt;
 }
@@ -80,7 +98,7 @@ static Z_Operand *ccl_rpn_simple (ODR o, struct ccl_rpn_node *p)
 {
     Z_Operand *zo;
 
-    zo = odr_malloc (o, sizeof(*zo));
+    zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
     assert (zo);
 
     switch (p->kind)
@@ -104,9 +122,9 @@ static Z_Complex *ccl_rpn_complex (ODR o, struct ccl_rpn_node *p)
     Z_Complex *zc;
     Z_Operator *zo;
 
-    zc = odr_malloc (o, sizeof(*zc));
+    zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
     assert (zc);
-    zo = odr_malloc (o, sizeof(*zo));
+    zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
     assert (zo);
 
     zc->roperator = zo;
@@ -114,15 +132,15 @@ static Z_Complex *ccl_rpn_complex (ODR o, struct ccl_rpn_node *p)
     {
     case CCL_RPN_AND:
         zo->which = Z_Operator_and;
-        zo->u.and = ODR_NULLVAL;
+        zo->u.and = odr_nullval();
         break;
     case CCL_RPN_OR:
         zo->which = Z_Operator_or;
-        zo->u.and = ODR_NULLVAL;
+        zo->u.and = odr_nullval();
         break;
     case CCL_RPN_NOT:
         zo->which = Z_Operator_and_not;
-        zo->u.and = ODR_NULLVAL;
+        zo->u.and = odr_nullval();
         break;
     default:
         assert (0);
@@ -136,7 +154,7 @@ static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p)
 {
     Z_RPNStructure *zs;
 
-    zs = odr_malloc (o, sizeof(*zs));
+    zs = (Z_RPNStructure *)odr_malloc (o, sizeof(*zs));
     assert (zs);
     switch (p->kind)
     {
@@ -162,7 +180,7 @@ Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
 {
     Z_RPNQuery *zq;
 
-    zq = odr_malloc (o, sizeof(*zq));
+    zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
     assert (zq);
     zq->attributeSetId = NULL;
     zq->RPNStructure = ccl_rpn_structure (o, p);