X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Fyaz-ccl.c;h=095bf4bdaba7a734c1bb1f70ab3d22b86aa78c09;hb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;hp=8aa385428fcbe696146f2d086397b72cf40e8c3a;hpb=d4c12ec7c451e74a949cc7c8d5fef226c995ddc6;p=yaz-moved-to-github.git

diff --git a/util/yaz-ccl.c b/util/yaz-ccl.c
index 8aa3854..095bf4b 100644
--- 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;
@@ -135,7 +141,7 @@ static Z_RPNStructure *ccl_rpn_structure (struct ccl_rpn_node *p)
     return zs;
 }
 
-Z_RPNQuery *ccl_rpn_query (struct ccl_rpn_node *p)
+Z_RPNQuery MDF *ccl_rpn_query (struct ccl_rpn_node *p)
 {
     Z_RPNQuery *zq;
 
@@ -146,7 +152,7 @@ Z_RPNQuery *ccl_rpn_query (struct ccl_rpn_node *p)
     return zq;
 }
 
-Z_AttributesPlusTerm *ccl_scan_query (struct ccl_rpn_node *p)
+Z_AttributesPlusTerm MDF *ccl_scan_query (struct ccl_rpn_node *p)
 {
     if (p->kind != CCL_RPN_TERM)
         return NULL;