Moving to v3.

[yaz-moved-to-github.git] / util / yaz-ccl.c

diff --git a/util/yaz-ccl.c b/util/yaz-ccl.c
index 8aa3854..a801874 100644 (file)
--- a/util/yaz-ccl.c
+++ b/util/yaz-ccl.c
@@ -38,12 +38,18 @@ static Z_AttributesPlusTerm *ccl_rpn_term (struct ccl_rpn_node *p)
             assert (zapt->attributeList[i]);
             zapt->attributeList[i]->attributeType =
                 &attr->type;
+#ifdef Z_95
+           zapt->attributeList[i]->attributeSet = 0;
+           zapt->attributeList[i]->which = Z_AttributeValue_numeric;
+           zapt->attributeList[i]->value.numeric = &attr->value;
+#else
             zapt->attributeList[i]->attributeValue =
                 &attr->value;
+#endif
         }
     }
     else
-        zapt->attributeList = NULL;
+        zapt->attributeList = ODR_NULLVAL;
     
     zapt->term = term;
     term->which = Z_Term_general;