Note incorrect ID-private OID for VAL_ADMINSERVICE

[yaz-moved-to-github.git] / zutil / yaz-ccl.c

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
index 45eeb37..0aa4c5a 100644 (file)
--- a/zutil/yaz-ccl.c
+++ b/zutil/yaz-ccl.c
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 1996-2002, Index Data.
+ * Copyright (c) 1996-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: yaz-ccl.c,v 1.16 2002-12-28 12:13:03 adam Exp $
+ * $Id: yaz-ccl.c,v 1.23 2003-06-24 23:03:04 adam Exp $
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/yaz-ccl.h>
 #include <yaz/pquery.h>
@@ -20,7 +21,6 @@ Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
 
     ccl_pquery(wr, p);
 
-    printf ("pqf=%s\n", wrbuf_buf(wr));
     q = yaz_pqf_parse(parser, o, wrbuf_buf(wr));
 
     wrbuf_free(wr, 1);
@@ -44,89 +44,3 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p)
     return q;
 }
 
-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, " ");
-           }
-           sprintf(tmpattr, "%d=%d ", att->type, att->value);
-           wrbuf_puts (w, tmpattr);
-       }
-       for (cp = p->u.t.term; *cp; cp++)
-       {
-           if (*cp == ' ' || *cp == '\\')
-               wrbuf_putc (w, '\\');
-           wrbuf_putc (w, *cp);
-       }
-       wrbuf_puts (w, " ");
-       break;
-    }
-}