X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fccl.h;h=14c34f34ae52457727a76a88f6e315ae3a238c97;hb=725fc033b729b22a1e0cfba614192b6fbfaeda4f;hp=076b8995cb89d1553e423569e25887d6385b2c7c;hpb=65efc4dd0a947e1b4620d93c88d771b83bc32dac;p=yaz-moved-to-github.git

diff --git a/include/yaz/ccl.h b/include/yaz/ccl.h
index 076b899..14c34f3 100644
--- a/include/yaz/ccl.h
+++ b/include/yaz/ccl.h
@@ -45,7 +45,7 @@
 /*
  * CCL - header file
  *
- * $Id: ccl.h,v 1.13 2002-12-28 12:13:03 adam Exp $
+ * $Id: ccl.h,v 1.15 2003-06-24 23:03:04 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -88,6 +88,7 @@
 #include <yaz/yconfig.h>
 #include <stdio.h>
 #include <yaz/xmalloc.h>
+#include <yaz/wrbuf.h>
 
 YAZ_BEGIN_CDECL
     
@@ -111,7 +112,13 @@ struct ccl_rpn_attr {
     struct ccl_rpn_attr *next;
     char *set;
     int type;
-    int value;
+    int kind;
+#define CCL_RPN_ATTR_NUMERIC 1
+#define CCL_RPN_ATTR_STRING 2
+    union {
+	int numeric;
+	char *str;
+    } value;
 };
 
 #define CCL_RPN_AND 1
@@ -277,7 +284,8 @@ YAZ_EXPORT void ccl_qual_add (CCL_bibset b, const char *name, int no,
 			      int *attr);
 
 YAZ_EXPORT void ccl_qual_add_set (CCL_bibset b, const char *name, int no,
-				  int *attr, char **attsets);
+				  int *type, int *value, char **svalue,
+				  char **attsets);
 
 YAZ_EXPORT void ccl_qual_add_special (CCL_bibset bibset,
                                       const char *n, const char *v);
@@ -325,6 +333,8 @@ YAZ_EXPORT char *ccl_strdup (const char *str);
 YAZ_EXPORT const char *ccl_qual_search_special (CCL_bibset b,
 						const char *name);
 
+YAZ_EXPORT void ccl_pquery (WRBUF w, struct ccl_rpn_node *p);
+
 #ifndef ccl_assert
 #define ccl_assert(x) ;
 #endif