X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ccl%2Fcclptree.c;h=055a140cafeabe786e7b438711961bf21d35fcb6;hp=0710fdd6083a653be95006fba0b2abb699c5c1ad;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=65efc4dd0a947e1b4620d93c88d771b83bc32dac

diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 0710fdd..055a140 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.11 2002-12-28 12:13:03 adam Exp $
+ * $Id: cclptree.c,v 1.15 2003-10-16 10:18:29 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -70,6 +70,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/ccl.h>
 
@@ -78,8 +79,7 @@ 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)
 {
@@ -91,11 +91,22 @@ 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;
@@ -154,6 +165,104 @@ void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
 }
 
 
+static void ccl_pquery_complex (WRBUF w, struct ccl_rpn_node *p)
+{
+    switch (p->kind)
+    {
+    case CCL_RPN_AND:
+    	wrbuf_puts(w, "@and ");
+		break;
+    case CCL_RPN_OR:
+    	wrbuf_puts(w, "@or ");
+		break;
+    case CCL_RPN_NOT:
+    	wrbuf_puts(w, "@not ");
+		break;
+    case CCL_RPN_PROX:
+        if (p->u.p[2] && p->u.p[2]->kind == CCL_RPN_TERM)
+        {
+            const char *cp = p->u.p[2]->u.t.term;
+            /* exlusion distance ordered relation which-code unit-code */
+            if (*cp == '!')
+            {   
+                /* word order specified */
+                if (isdigit(cp[1]))
+                    wrbuf_printf(w, "@prox 0 %s 1 2 k 2 ", cp+1);
+                else
+                    wrbuf_printf(w, "@prox 0 1 1 2 k 2 ");
+            } 
+            else if (*cp == '%')
+            {
+                /* word order not specified */
+                if (isdigit(cp[1]))
+                    wrbuf_printf(w, "@prox 0 %s 0 2 k 2 ", cp+1);
+                else
+                    wrbuf_printf(w, "@prox 0 1 0 2 k 2 ");
+            }
+        }
+        else
+            wrbuf_puts(w, "@prox 0 2 0 1 k 2 ");
+		break;
+    default:
+		wrbuf_puts(w, "@ bad op (unknown) ");
+    }
+    ccl_pquery(w, p->u.p[0]);
+    ccl_pquery(w, p->u.p[1]);
+}
+
+void ccl_pquery (WRBUF w, struct ccl_rpn_node *p)
+{
+    struct ccl_rpn_attr *att;
+    const char *cp;
+	
+    switch (p->kind)
+    {
+    case CCL_RPN_AND:
+    case CCL_RPN_OR:
+    case CCL_RPN_NOT:
+    case CCL_RPN_PROX:
+    	ccl_pquery_complex (w, p);
+		break;
+    case CCL_RPN_SET:
+		wrbuf_puts (w, "@set ");
+		wrbuf_puts (w, p->u.setname);
+		wrbuf_puts (w, " ");
+		break;
+    case CCL_RPN_TERM:
+    	for (att = p->u.t.attr_list; att; att = att->next)
+		{
+			char tmpattr[128];
+			wrbuf_puts (w, "@attr ");
+			if (att->set)
+			{
+				wrbuf_puts (w, att->set);
+				wrbuf_puts (w, " ");
+			}
+			switch(att->kind)
+			{
+			case CCL_RPN_ATTR_NUMERIC:
+				sprintf(tmpattr, "%d=%d ", att->type, att->value.numeric);
+				wrbuf_puts (w, tmpattr);
+				break;
+			case CCL_RPN_ATTR_STRING:
+				sprintf(tmpattr, "%d=", att->type);
+				wrbuf_puts (w, tmpattr);
+				wrbuf_puts(w, att->value.str);
+				wrbuf_puts (w, " ");
+				break;
+			}
+		}
+		for (cp = p->u.t.term; *cp; cp++)
+		{
+			if (*cp == ' ' || *cp == '\\')
+				wrbuf_putc (w, '\\');
+			wrbuf_putc (w, *cp);
+		}
+		wrbuf_puts (w, " ");
+		break;
+    }
+}
+
 /*
  * Local variables:
  * tab-width: 4