X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclptree.c;h=79f45232ceebd47dad5a54426fd0cf3b7fe364d1;hb=f722c8d9517ec491e2469cdc91a3751dd5e7a6df;hp=d8aef6e6b00f276e3df49fee9a4aa8f7924bd1ba;hpb=3888e88cde70f36851544ab7acc04e0943470ec6;p=yaz-moved-to-github.git diff --git a/ccl/cclptree.c b/ccl/cclptree.c index d8aef6e..79f4523 100644 --- a/ccl/cclptree.c +++ b/ccl/cclptree.c @@ -44,9 +44,9 @@ /* CCL print rpn tree - infix notation * Europagate, 1995 * - * $Log: cclptree.c,v $ - * Revision 1.4 1996-10-11 15:00:25 adam - * CCL parser from Europagate Email gateway 1.0. + * $Id: cclptree.c,v 1.9 2001-11-27 22:38:50 adam Exp $ + * + * Old Europagate Log: * * Revision 1.6 1995/05/16 09:39:26 adam * LICENSE. @@ -69,10 +69,9 @@ */ #include -#include #include -#include +#include void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out) { @@ -85,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: @@ -120,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); } }