X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclptree.c;h=924971f037aa3d354e4f8a47ee0c139f466ac250;hb=854bc0025cf4f8cbd509e2d1de7d2f8a1ea126ac;hp=4e42e002f1e56d1bfece5bc56b54b92820949ab5;hpb=c126b2a625462f95475f00efdfdf9ce41a0e9c79;p=yaz-moved-to-github.git

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 4e42e00..924971f 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -44,20 +44,9 @@
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
- * $Log: cclptree.c,v $
- * 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.
+ * $Id: cclptree.c,v 1.12 2003-02-14 18:49:23 adam Exp $
  *
- * 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.
+ * Old Europagate Log:
  *
  * Revision 1.6  1995/05/16  09:39:26  adam
  * LICENSE.
@@ -81,55 +70,94 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.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);
         }
-	break;
+		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, ")");
-	break;
+        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, ")");
-	break;
+        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, ")");
-	break;
+        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);
-	break;
+        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, ")");
-	break;
+        if (rpn->u.p[2] && rpn->u.p[2]->kind == CCL_RPN_TERM)
+        {
+            const char *cp = rpn->u.p[2]->u.t.term;
+            /* exlusion distance ordered relation which-code unit-code */
+            if (*cp == '!')
+            {   
+                /* word order specified */
+                if (isdigit(cp[1]))
+                    fprintf(fd_out, "@prox 0 %s 1 2 known 2", cp+1);
+                else
+                    fprintf(fd_out, "@prox 0 1 1 2 known 2");
+            } 
+            else if (*cp == '%')
+            {
+                /* word order not specified */
+                if (isdigit(cp[1]))
+                    fprintf(fd_out, "@prox 0 %s 0 2 known 2", cp+1);
+                else
+                    fprintf(fd_out, "@prox 0 1 0 2 known 2");
+            }
+        }
+        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:
-	ccl_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:
+ */