X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=zutil%2Fyaz-ccl.c;h=33f46b3918c25f151461ad992c06966a8246be9b;hb=f4f32744882a4da78763956d1d363ea20a6bb471;hp=12456d3650d0b09bc3b5ceef3dfcf642b175680d;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
index 12456d3..33f46b3 100644
--- a/zutil/yaz-ccl.c
+++ b/zutil/yaz-ccl.c
@@ -2,12 +2,13 @@
  * Copyright (c) 1996-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: yaz-ccl.c,v 1.18 2003-01-06 08:20:29 adam Exp $
+ * $Id: yaz-ccl.c,v 1.22 2003-06-23 12:41:44 adam Exp $
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/yaz-ccl.h>
 #include <yaz/pquery.h>
@@ -116,8 +117,19 @@ void ccl_pquery (WRBUF w, struct ccl_rpn_node *p)
 		wrbuf_puts (w, att->set);
 		wrbuf_puts (w, " ");
 	    }
-	    sprintf(tmpattr, "%d=%d ", att->type, att->value);
-	    wrbuf_puts (w, tmpattr);
+	    switch(att->kind)
+	    {
+	    case CCL_RPN_ATTR_NUMERIC:
+		sprintf(tmpattr, "%d=%d ", att->type, att->value.numeric);
+		wrbuf_puts (w, tmpattr);
+		break;
+	    case CCL_RPN_ATTR_STRING:
+		sprintf(tmpattr, "%d=", att->type);
+		wrbuf_puts (w, tmpattr);
+		wrbuf_puts(w, att->value.str);
+		wrbuf_puts (w, " ");
+		break;
+	    }
 	}
 	for (cp = p->u.t.term; *cp; cp++)
 	{