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

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index d8aef6e..0f50a94 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -45,7 +45,21 @@
  * Europagate, 1995
  *
  * $Log: cclptree.c,v $
- * Revision 1.4  1996-10-11 15:00:25  adam
+ * 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.4  1996/10/11  15:00:25  adam
  * CCL parser from Europagate Email gateway 1.0.
  *
  * Revision 1.6  1995/05/16  09:39:26  adam
@@ -69,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)
 {
@@ -85,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:
@@ -120,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);
     }
 }