X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fyaz-ccl.c;h=f4033e1e8428e422c236fe1d3217b677d4eb4e47;hb=03c1d6e9c2c2c0bb2ee01e38d7f464a311bfe9e9;hp=17194badba28a94f66376ea227d0886603faa22c;hpb=4491bbb1a05c42c1540c3eb16401028eac05c36a;p=yaz-moved-to-github.git

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
index 17194ba..f4033e1 100644
--- a/zutil/yaz-ccl.c
+++ b/zutil/yaz-ccl.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-ccl.c,v $
- * Revision 1.10  2001-02-20 11:23:50  adam
+ * Revision 1.12  2001-03-07 13:24:40  adam
+ * Member and_not in Z_Operator is kept for backwards compatibility.
+ * Added support for definition of CCL operators in field spec file.
+ *
+ * Revision 1.11  2001/02/21 13:46:54  adam
+ * C++ fixes.
+ *
+ * Revision 1.10  2001/02/20 11:23:50  adam
  * Updated ccl_pquery to consider local attribute set too.
  *
  * Revision 1.9  2000/11/27 14:16:55  adam
@@ -108,7 +115,7 @@ static Z_AttributesPlusTerm *ccl_rpn_term (ODR o, struct ccl_rpn_node *p)
 
 		    ident.oclass = CLASS_ATTSET;
 		    ident.proto = PROTO_Z3950;
-		    ident.value = value;
+		    ident.value = (oid_value) value;
 		    elements[i]->attributeSet =
 			odr_oiddup (o, oid_ent_to_oid (&ident, oid));
 		}
@@ -172,15 +179,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_not = odr_nullval();
         break;
     case CCL_RPN_OR:
         zo->which = Z_Operator_or;
-        zo->u.and = odr_nullval();
+        zo->u.and_not = odr_nullval();
         break;
     case CCL_RPN_NOT:
         zo->which = Z_Operator_and_not;
-        zo->u.and = odr_nullval();
+        zo->u.and_not = odr_nullval();
         break;
     case CCL_RPN_PROX:
 	zo->which = Z_Operator_prox;
@@ -202,7 +209,7 @@ static Z_Complex *ccl_rpn_complex (ODR o, struct ccl_rpn_node *p)
 	*zo->u.prox->relationType = Z_ProximityOperator_Prox_lessThan;
 	zo->u.prox->which = Z_ProximityOperator_known;
 	zo->u.prox->u.known = 
-	    odr_malloc (o, sizeof(*zo->u.prox->u.known));
+	    (Z_ProxUnit *) odr_malloc (o, sizeof(*zo->u.prox->u.known));
 	*zo->u.prox->u.known = Z_ProxUnit_word;
 #else
 	*zo->u.prox->relationType = Z_Prox_lessThan;