X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fyaz-ccl.c;h=d1ab287cc38eb9485cf0f2a73f5ff7506700a296;hb=a25b89e9d30e6de573f20d5b591068d49d639a5d;hp=f32f4f1a93b8c1cfef52b2d6ab1ff49b385157a1;hpb=eaf27c9dc97e048dcd9a90dc05aa8133b3020c5b;p=yaz-moved-to-github.git

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
index f32f4f1..d1ab287 100644
--- a/zutil/yaz-ccl.c
+++ b/zutil/yaz-ccl.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1996-2000, Index Data.
+ * Copyright (c) 1996-2001, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-ccl.c,v $
- * Revision 1.8  2000-11-16 13:03:13  adam
+ * Revision 1.13  2001-05-09 23:31:35  adam
+ * String attribute values for PQF. Proper C-backslash escaping for PQF.
+ *
+ * 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
+ * Fixed bug in ccl_rpn_simple regarding resultSetId's.
+ *
+ * Revision 1.8  2000/11/16 13:03:13  adam
  * Function ccl_rpn_query sets attributeSet to Bib-1.
  *
  * Revision 1.7  2000/11/16 09:58:02  adam
@@ -102,7 +117,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));
 		}
@@ -145,7 +160,7 @@ static Z_Operand *ccl_rpn_simple (ODR o, struct ccl_rpn_node *p)
         break;
     case CCL_RPN_SET:
         zo->which = Z_Operand_resultSetId;
-        zo->u.resultSetId = p->u.setname;
+        zo->u.resultSetId = odr_strdup (o, p->u.setname);
         break;
     default:
 	return 0;
@@ -166,15 +181,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;
@@ -196,7 +211,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;
@@ -287,6 +302,7 @@ static void ccl_pquery_complex (WRBUF w, struct ccl_rpn_node *p)
 void ccl_pquery (WRBUF w, struct ccl_rpn_node *p)
 {
     struct ccl_rpn_attr *att;
+    const char *cp;
 
     switch (p->kind)
     {
@@ -305,12 +321,22 @@ void ccl_pquery (WRBUF w, struct ccl_rpn_node *p)
     	for (att = p->u.t.attr_list; att; att = att->next)
 	{
 	    char tmpattr[128];
-	    sprintf(tmpattr, "@attr %d=%d ", att->type, att->value);
+	    wrbuf_puts (w, "@attr ");
+	    if (att->set)
+	    {
+		wrbuf_puts (w, att->set);
+		wrbuf_puts (w, " ");
+	    }
+	    sprintf(tmpattr, "%d=%d ", att->type, att->value);
 	    wrbuf_puts (w, tmpattr);
 	}
-	wrbuf_puts (w, "{");
-	wrbuf_puts (w, p->u.t.term);
-	wrbuf_puts (w, "} ");
+	for (cp = p->u.t.term; *cp; cp++)
+	{
+	    if (*cp == ' ' || *cp == '\\')
+		wrbuf_putc (w, '\\');
+	    wrbuf_putc (w, *cp);
+	}
+	wrbuf_puts (w, " ");
 	break;
     }
 }