X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclptree.c;h=0f50a948a1919d54362857102f491edac8e6c679;hb=a7b99c21cc2445c19d3f76150049b42a96631b48;hp=2b2cb9a37299ffd2d5f94dc011880aa5d645740d;hpb=63cafe41a93427118959a74201b3e331169a71d9;p=yaz-moved-to-github.git

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 2b2cb9a..0f50a94 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -1,15 +1,69 @@
+/*
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
  * $Log: cclptree.c,v $
- * Revision 1.3  1995-09-29 17:11:59  quinn
- * Smallish
+ * Revision 1.8  2000-11-16 09:58:02  adam
+ * Implemented local AttributeSet setting for CCL field maps.
+ *
+ * Revision 1.7  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.6  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.5  1997/04/30 08:52:06  quinn
+ * Null
  *
- * Revision 1.2  1995/09/27  15:02:44  quinn
- * Modified function heads & prototypes.
+ * Revision 1.4  1996/10/11  15:00:25  adam
+ * CCL parser from Europagate Email gateway 1.0.
  *
- * Revision 1.1  1995/04/10  10:28:20  quinn
- * Added copy of CCL.
+ * Revision 1.6  1995/05/16  09:39:26  adam
+ * LICENSE.
  *
  * Revision 1.5  1995/02/23  08:31:59  adam
  * Changed header.
@@ -29,10 +83,9 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 
-#include <ccl.h>
+#include <yaz/ccl.h>
 
 void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
 {
@@ -45,7 +98,11 @@ void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
         {
             struct ccl_rpn_attr *attr;
             for (attr = rpn->u.t.attr_list; attr; attr = attr->next)
-                fprintf (fd_out, " %d=%d", attr->type, attr->value);
+                if (attr->set)
+                    fprintf (fd_out, " %s,%d=%d", attr->set, attr->type,
+                             attr->value);
+                else
+                    fprintf (fd_out, " %d=%d", attr->type, attr->value);
         }
 	break;
     case CCL_RPN_AND:
@@ -80,6 +137,6 @@ void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
 	fprintf (fd_out, ")");
 	break;
     default:
-	assert (0);
+	ccl_assert (0);
     }
 }