X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclptree.c;h=d1c7d64cdaac4c7447e38027d2a7e2048f950829;hb=79135288365437a3b1ee89ba36059dcec9f52a70;hp=a1f00d541bbc2c8123e86f2f05124972fbadb896;hpb=79fb4b8deb48939a8d9e3fce48c7736eb3b1cf0b;p=yaz-moved-to-github.git

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index a1f00d5..d1c7d64 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -44,7 +44,7 @@
 /* CCL print rpn tree - infix notation
  * Europagate, 1995
  *
- * $Id: cclptree.c,v 1.10 2002-07-12 12:11:33 ja7 Exp $
+ * $Id: cclptree.c,v 1.13 2003-06-23 10:22:21 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -70,6 +70,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/ccl.h>
 
@@ -91,37 +92,68 @@ void ccl_pr_tree_as_qrpn(struct ccl_rpn_node *rpn, FILE *fd_out, int indent)
         {
             struct ccl_rpn_attr *attr;
             for (attr = rpn->u.t.attr_list; attr; attr = attr->next)
-                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);
+			{
+				if (attr->set)
+					fprintf(fd_out, "@attr %s", attr->set);
+				else
+					fprintf(fd_out, "@attr ");
+				switch(attr->kind)
+				{
+				case CCL_RPN_ATTR_NUMERIC:
+                    fprintf (fd_out, "%d=%d ", attr->type,
+                             attr->value.numeric);
+					break;
+				case CCL_RPN_ATTR_STRING:
+                    fprintf (fd_out, "%d=%s ", attr->type,
+							 attr->value.str);
+				}
+			}
         }
 		fprintf (fd_out, "\"%s\"\n", rpn->u.t.term);
-	break;
+        break;
     case CCL_RPN_AND:
-	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;
+        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, "@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;
+        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, "@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;
+        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, "@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;
+        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:
 		fprintf(stderr,"Internal Error Unknown ccl_rpn node type %d\n",rpn->kind);
     }