X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclp.h;h=00ef64ef74286e46ff5861e3640184dda0d81374;hp=1f59728f9f797e67dcd95a37240b19ad38c33de8;hb=053c92d650501a953d68b228ad74d96b4606eaf6;hpb=78b138b80fadc817d621f0a692fca857ee31399b

diff --git a/src/cclp.h b/src/cclp.h
index 1f59728..00ef64e 100644
--- a/src/cclp.h
+++ b/src/cclp.h
@@ -1,13 +1,33 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: cclp.h,v 1.3 2007-04-30 11:33:49 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/** 
- * \file cclp.h 
- * \brief CCL header with private definitions 
+/**
+ * \file cclp.h
+ * \brief CCL header with private definitions
  */
 #include <yaz/ccl.h>
 
@@ -41,25 +61,25 @@ struct ccl_token {
 struct ccl_parser {
     /** current lookahead token */
     struct ccl_token *look_token;
-    
+
     /** holds error code if error occur */
     int error_code;
     /** start of CCL string buffer */
     const char *start_pos;
     /** if error occurs, this holds position (starting from 0). */
     const char *error_pos;
-    
+
     /** current bibset */
     CCL_bibset bibset;
 
     /** names of and operator */
-    char *ccl_token_and;
+    const char **ccl_token_and;
     /** names of or operator */
-    char *ccl_token_or;
+    const char **ccl_token_or;
     /** names of not operator */
-    char *ccl_token_not;
+    const char **ccl_token_not;
     /** names of set operator */
-    char *ccl_token_set;
+    const char **ccl_token_set;
     /** 1=CCL parser is case sensitive, 0=case insensitive */
     int ccl_case_sensitive;
 };
@@ -71,7 +91,7 @@ struct ccl_parser {
 YAZ_EXPORT
 struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command);
 
-/** 
+/**
  * Deletes token list
  */
 YAZ_EXPORT
@@ -90,7 +110,7 @@ struct ccl_rpn_node *ccl_parser_find_token(CCL_parser cclp,
 
 
 YAZ_EXPORT
-ccl_qualifier_t ccl_qual_search(CCL_parser cclp, const char *name, 
+ccl_qualifier_t ccl_qual_search(CCL_parser cclp, const char *name,
                                 size_t name_len, int seq);
 
 YAZ_EXPORT
@@ -102,6 +122,7 @@ const char *ccl_qual_get_name(ccl_qualifier_t q);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab