CCL qualifier aliases (use OR for more than one qualifier).

[yaz-moved-to-github.git] / ccl / cclptree.c

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 5ed36c0..79f4523 100644 (file)
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -44,12 +44,9 @@
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
- * $Log: cclptree.c,v $
- * Revision 1.5  1997-04-30 08:52:06  quinn
- * Null
+ * $Id: cclptree.c,v 1.9 2001-11-27 22:38:50 adam Exp $
  *
- * Revision 1.4  1996/10/11  15:00:25  adam
- * CCL parser from Europagate Email gateway 1.0.
+ * Old Europagate Log:
  *
  * Revision 1.6  1995/05/16  09:39:26  adam
  * LICENSE.
@@ -72,10 +69,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)
 {
@@ -88,7 +84,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:
@@ -123,6 +123,6 @@ void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
        fprintf (fd_out, ")");
        break;
     default:
-       assert (0);
+       ccl_assert (0);
     }
 }