X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fccl.h;h=6296864079837ca486df5e46f9ac2fd0bf89a940;hb=8f8560e0ab3b370263683d8aea81b839c5927091;hp=fc36303bcfc8c1a04948f268c83ec1dcc9ad3ba2;hpb=f53079fadcadb1eeef45e1e6d254801d984d6068;p=yaz-moved-to-github.git

diff --git a/include/yaz/ccl.h b/include/yaz/ccl.h
index fc36303..6296864 100644
--- a/include/yaz/ccl.h
+++ b/include/yaz/ccl.h
@@ -43,13 +43,13 @@
  */
 
 /** \file ccl.h
-    \brief Header with public definitions about CCL.
+    \brief Header with public definitions for CCL.
 */
 
 /*
  * CCL - header file
  *
- * $Id: ccl.h,v 1.19 2004-10-03 22:34:07 adam Exp $
+ * $Id: ccl.h,v 1.23 2005-06-25 15:46:01 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -124,10 +124,10 @@ struct ccl_rpn_attr {
 #define CCL_RPN_ATTR_NUMERIC 1
 #define CCL_RPN_ATTR_STRING 2
     union {
-	/** numeric attribute value */
-	int numeric;
-	/** string attribute value */
-	char *str;
+        /** numeric attribute value */
+        int numeric;
+        /** string attribute value */
+        char *str;
     } value;
 };
 
@@ -143,15 +143,15 @@ struct ccl_rpn_node {
     /** RPN tree node type */
     int kind;
     union {
-	/** Boolean including proximity 0=left, 2=right, 3=prox parms */
-	struct ccl_rpn_node *p[3];
-	/** Attributes + Term */
-	struct {
-	    char *term;
-	    struct ccl_rpn_attr *attr_list;
-	} t;
-	/** Result set */
-	char *setname;
+        /** Boolean including proximity 0=left, 2=right, 3=prox parms */
+        struct ccl_rpn_node *p[3];
+        /** Attributes + Term */
+        struct {
+            char *term;
+            struct ccl_rpn_attr *attr_list;
+        } t;
+        /** Result set */
+        char *setname;
     } u;
 };
 
@@ -219,10 +219,12 @@ typedef struct ccl_qualifiers *CCL_bibset;
 /** CCL token */
 struct ccl_token {
     char kind;
-    size_t len;
-    const char *name;
+    size_t len;                 /* length of name below */
+    const char *name;           /* string / name of token */
     struct ccl_token *next;
     struct ccl_token *prev;
+    const char *ws_prefix_buf;  /* leading white space buf */
+    size_t ws_prefix_len;       /* leading white space len */
 };
 
 /** CCL Qualifier */
@@ -277,13 +279,6 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command);
 YAZ_EXPORT
 struct ccl_token *ccl_tokenize (const char *command);
     
-/**
- * Splits CCL command into tokens. This function is obsolete. Use
- * ccl_parser_tokenize instead.
- */
-YAZ_EXPORT
-struct ccl_token *ccl_token_simple (const char *command);
-
 /** 
  * Deletes token list
  */
@@ -303,7 +298,7 @@ struct ccl_token *ccl_token_add (struct ccl_token *at);
  */
 YAZ_EXPORT
 struct ccl_rpn_node *ccl_find_str (CCL_bibset bibset,
-				   const char *str, int *error, int *pos);
+                                   const char *str, int *error, int *pos);
 
 /**
  * Parses CCL Find command from a list of CCL tokens. Otherwise similar to
@@ -359,7 +354,7 @@ void ccl_qual_add (CCL_bibset b, const char *name, int no, int *attr);
 /** Add qualifier and supply attributes pairs+attribute set for it */
 YAZ_EXPORT
 void ccl_qual_add_set (CCL_bibset b, const char *name, int no,
-		       int *type, int *value, char **svalue, char **attsets);
+                       int *type, int *value, char **svalue, char **attsets);
 
 /** Add special qualifier */
 YAZ_EXPORT
@@ -388,7 +383,7 @@ void ccl_qual_line(CCL_bibset bibset, char *line);
 /* Add CCL qualifier by using qual_name + value pair */
 YAZ_EXPORT
 void ccl_qual_fitem (CCL_bibset bibset, const char *value,
-		     const char *qual_name);
+                     const char *qual_name);
 
 /** Make CCL qualifier set */
 YAZ_EXPORT
@@ -412,7 +407,7 @@ int ccl_memicmp (const char *s1, const char *s2, size_t n);
 /** Search for qualifier 'name' in set 'b'. */
 YAZ_EXPORT
 struct ccl_rpn_attr *ccl_qual_search (CCL_parser cclp, const char *name,
-				      size_t len, int seq);
+                                      size_t len, int seq);
 
 /** Create CCL parser */
 YAZ_EXPORT
@@ -429,7 +424,7 @@ char *ccl_strdup (const char *str);
 /** Search for special qualifier */
 YAZ_EXPORT
 const char *ccl_qual_search_special (CCL_bibset b,
-						const char *name);
+                                                const char *name);
 /** Pretty-print CCL RPN node tree to WRBUF */
 YAZ_EXPORT
 void ccl_pquery (WRBUF w, struct ccl_rpn_node *p);
@@ -442,3 +437,11 @@ YAZ_END_CDECL
 
 #endif
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+