X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclptree.c;h=a1f00d541bbc2c8123e86f2f05124972fbadb896;hb=366dc7568281c9774cd309b28c24a077604264a0;hp=2c37bd91bfef1953fa93902666e2bcd66fad7ec5;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 2c37bd9..a1f00d5 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -44,15 +44,9 @@
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
- * $Log: cclptree.c,v $
- * Revision 1.6  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
+ * $Id: cclptree.c,v 1.10 2002-07-12 12:11:33 ja7 Exp $
  *
- * 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.
+ * Old Europagate Log:
  *
  * Revision 1.6  1995/05/16  09:39:26  adam
  * LICENSE.
@@ -75,57 +69,74 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 
 #include <yaz/ccl.h>
 
-void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
+void fprintSpaces(int indent,FILE * fd_out) 
 {
+	char buf[100];
+	sprintf(buf,"%%%d.s",indent);
+	fprintf(fd_out,buf," ");
+};
 
+
+void ccl_pr_tree_as_qrpn(struct ccl_rpn_node *rpn, FILE *fd_out, int indent)
+{
+	if(indent>0) fprintSpaces(indent,fd_out);
     switch (rpn->kind)
     {
     case CCL_RPN_TERM:
-	fprintf (fd_out, "\"%s\"", rpn->u.t.term);
         if (rpn->u.t.attr_list)
         {
             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, "@attr %s %d=%d ", attr->set, attr->type,
+                             attr->value);
+                else
+                    fprintf (fd_out, "@attr %d=%d ", attr->type, attr->value);
         }
+		fprintf (fd_out, "\"%s\"\n", rpn->u.t.term);
 	break;
     case CCL_RPN_AND:
-	fprintf (fd_out, "(");
-	ccl_pr_tree (rpn->u.p[0], fd_out);
-	fprintf (fd_out, ") and (");
-	ccl_pr_tree (rpn->u.p[1], fd_out);
-	fprintf (fd_out, ")");
+	fprintf (fd_out, "@and \n");
+	ccl_pr_tree_as_qrpn (rpn->u.p[0], fd_out,indent+2);
+	ccl_pr_tree_as_qrpn (rpn->u.p[1], fd_out,indent+2);
 	break;
     case CCL_RPN_OR:
-	fprintf (fd_out, "(");
-	ccl_pr_tree (rpn->u.p[0], fd_out);
-	fprintf (fd_out, ") or (");
-	ccl_pr_tree (rpn->u.p[1], fd_out);
-	fprintf (fd_out, ")");
+	fprintf (fd_out, "@or \n");
+	ccl_pr_tree_as_qrpn (rpn->u.p[0], fd_out,indent+2);
+	ccl_pr_tree_as_qrpn (rpn->u.p[1], fd_out,indent+2);
 	break;
     case CCL_RPN_NOT:
-	fprintf (fd_out, "(");
-	ccl_pr_tree (rpn->u.p[0], fd_out);
-	fprintf (fd_out, ") not (");
-	ccl_pr_tree (rpn->u.p[1], fd_out);
-	fprintf (fd_out, ")");
+	fprintf (fd_out, "@not ");
+	ccl_pr_tree_as_qrpn (rpn->u.p[0], fd_out,indent+2);
+	ccl_pr_tree_as_qrpn (rpn->u.p[1], fd_out,indent+2);
 	break;
     case CCL_RPN_SET:
-	fprintf (fd_out, "set=%s", rpn->u.setname);
+	fprintf (fd_out, "set=%s ", rpn->u.setname);
 	break;
     case CCL_RPN_PROX:
-	fprintf (fd_out, "(");
-	ccl_pr_tree (rpn->u.p[0], fd_out);
-	fprintf (fd_out, ") prox (");
-	ccl_pr_tree (rpn->u.p[1], fd_out);
-	fprintf (fd_out, ")");
+	fprintf (fd_out, "@prox ");
+	ccl_pr_tree_as_qrpn (rpn->u.p[0], fd_out,indent+2);
+	ccl_pr_tree_as_qrpn (rpn->u.p[1], fd_out,indent+2);
 	break;
     default:
-	assert (0);
+		fprintf(stderr,"Internal Error Unknown ccl_rpn node type %d\n",rpn->kind);
     }
 }
+
+
+void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
+{
+	ccl_pr_tree_as_qrpn(rpn,fd_out,0);
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */