Moved file to be part of zutil (instead of util).

diff --git a/Makefile.in b/Makefile.in
index bd2c11b..314b3e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
 # Copyright (C) 1995-1999, Index Data 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss

-# $Id: Makefile.in,v 1.8 1999-06-08 10:10:15 adam Exp $
+# $Id: Makefile.in,v 1.9 1999-06-08 10:12:43 adam Exp $

 
 # Uncomment the lines below to enable mOSI communcation.
 #CDEFS=-DUSE_XTIMOSI
 
 # Uncomment the lines below to enable mOSI communcation.
 #CDEFS=-DUSE_XTIMOSI

@@ -22,7 +22,7 @@ CC=@CC@
 CPP=@CPP@
 SHELL=/bin/sh
 MAKE=make
 CPP=@CPP@
 SHELL=/bin/sh
 MAKE=make

-SUBDIR=$(MOD) util odr zutil $(RFC1006) ccl comstack retrieval client server ztest lib
+SUBDIR=util $(MOD) odr zutil $(RFC1006) ccl comstack retrieval client server ztest lib

 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 
 # Add external libraries to the LIBS macro
 LIBS=@LIBS@
 

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
new file mode 100644 (file)
index 0000000..4233744
--- /dev/null
+++ b/zutil/yaz-ccl.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 1996-1998, Index Data.
+ * See the file LICENSE for details.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: yaz-ccl.c,v $
+ * Revision 1.1  1999-06-08 10:12:43  adam
+ * Moved file to be part of zutil (instead of util).
+ *
+ * Revision 1.13  1998/03/31 15:13:20  adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.12  1998/02/11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11  1997/11/24 11:33:57  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.10  1997/09/29 08:58:25  adam
+ * Fixed conversion of trees so that true copy is made.
+ *
+ * Revision 1.9  1997/06/23 10:31:25  adam
+ * Added ODR argument to ccl_rpn_query and ccl_scan_query.
+ *
+ * Revision 1.8  1996/10/29 13:36:27  adam
+ * Added header.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <yaz-ccl.h>
+
+static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p);
+
+static Z_AttributesPlusTerm *ccl_rpn_term (ODR o, struct ccl_rpn_node *p)
+{
+    struct ccl_rpn_attr *attr;
+    int num = 0;
+    Z_AttributesPlusTerm *zapt;
+    Odr_oct *term_octet;
+    Z_Term *term;
+    Z_AttributeElement **elements;
+
+    zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
+    assert (zapt);
+
+    term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
+    assert (term_octet);
+
+    term = (Z_Term *)odr_malloc (o, sizeof(*term));
+    assert(term);
+
+    for (attr = p->u.t.attr_list; attr; attr = attr->next)
+        num++;
+    if (!num)
+        elements = (Z_AttributeElement**)odr_nullval();
+    else
+    {
+        int i = 0;
+       elements = (Z_AttributeElement **)
+           odr_malloc (o, num*sizeof(*elements));
+        for (attr = p->u.t.attr_list; attr; attr = attr->next, i++)
+        {
+            elements[i] = (Z_AttributeElement *)
+               odr_malloc (o, sizeof(**elements));
+            assert (elements[i]);
+            elements[i]->attributeType =
+               (int *)odr_malloc(o, sizeof(int));
+            *elements[i]->attributeType = attr->type;
+           elements[i]->attributeSet = 0;
+           elements[i]->which = Z_AttributeValue_numeric;
+           elements[i]->value.numeric =
+               (int *)odr_malloc (o, sizeof(int));
+           *elements[i]->value.numeric = attr->value;
+        }
+    }
+#ifdef ASN_COMPILED
+    zapt->attributes = (Z_AttributeList *)
+       odr_malloc (o, sizeof(*zapt->attributes));
+    zapt->attributes->num_attributes = num;
+    zapt->attributes->attributes = elements;
+#else
+    zapt->num_attributes = num;
+    zapt->attributeList = elements;
+#endif    
+    zapt->term = term;
+    term->which = Z_Term_general;
+    term->u.general = term_octet;
+    term_octet->len = term_octet->size = strlen (p->u.t.term);
+    term_octet->buf = (unsigned char *)odr_malloc (o, term_octet->len+1);
+    strcpy ((char*) term_octet->buf, p->u.t.term);
+    return zapt;
+}
+
+static Z_Operand *ccl_rpn_simple (ODR o, struct ccl_rpn_node *p)
+{
+    Z_Operand *zo;
+
+    zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
+    assert (zo);
+
+    switch (p->kind)
+    {
+    case CCL_RPN_TERM:
+        zo->which = Z_Operand_APT;
+        zo->u.attributesPlusTerm = ccl_rpn_term (o, p);
+        break;
+    case CCL_RPN_SET:
+        zo->which = Z_Operand_resultSetId;
+        zo->u.resultSetId = p->u.setname;
+        break;
+    default:
+        assert (0);
+    }
+    return zo;
+}
+
+static Z_Complex *ccl_rpn_complex (ODR o, struct ccl_rpn_node *p)
+{
+    Z_Complex *zc;
+    Z_Operator *zo;
+
+    zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
+    assert (zc);
+    zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
+    assert (zo);
+
+    zc->roperator = zo;
+    switch (p->kind)
+    {
+    case CCL_RPN_AND:
+        zo->which = Z_Operator_and;
+        zo->u.and = odr_nullval();
+        break;
+    case CCL_RPN_OR:
+        zo->which = Z_Operator_or;
+        zo->u.and = odr_nullval();
+        break;
+    case CCL_RPN_NOT:
+        zo->which = Z_Operator_and_not;
+        zo->u.and = odr_nullval();
+        break;
+    default:
+        assert (0);
+    }
+    zc->s1 = ccl_rpn_structure (o, p->u.p[0]);
+    zc->s2 = ccl_rpn_structure (o, p->u.p[1]);
+    return zc;
+}
+
+static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p)
+{
+    Z_RPNStructure *zs;
+
+    zs = (Z_RPNStructure *)odr_malloc (o, sizeof(*zs));
+    assert (zs);
+    switch (p->kind)
+    {
+    case CCL_RPN_AND:
+    case CCL_RPN_OR:
+    case CCL_RPN_NOT:
+    case CCL_RPN_PROX:
+        zs->which = Z_RPNStructure_complex;
+        zs->u.complex = ccl_rpn_complex (o, p);
+        break;
+    case CCL_RPN_TERM:
+    case CCL_RPN_SET:
+        zs->which = Z_RPNStructure_simple;
+        zs->u.simple = ccl_rpn_simple (o, p);
+        break;
+    default:
+        assert (0);
+    }
+    return zs;
+}
+
+Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
+{
+    Z_RPNQuery *zq;
+
+    zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
+    assert (zq);
+    zq->attributeSetId = NULL;
+    zq->RPNStructure = ccl_rpn_structure (o, p);
+    return zq;
+}
+
+Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p)
+{
+    if (p->kind != CCL_RPN_TERM)
+        return NULL;
+    return ccl_rpn_term (o, p);
+}