X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fxcqlutil.c;h=99327c564f993138752da3b73fe02b308d9c62a4;hb=3fec27d8561b3634b4c1c6e32f09395d9690509f;hp=70ecbde8f26c1de41410afa1a1b426eb68ede013;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git
diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 70ecbde..99327c5 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,5 +1,5 @@
-/* $Id: xcqlutil.c,v 1.6 2005-06-25 15:46:06 adam Exp $
- Copyright (C) 1995-2005, Index Data ApS
+/* $Id: xcqlutil.c,v 1.9 2008-01-06 16:22:02 adam Exp $
+ Copyright (C) 1995-2007, Index Data ApS
Index Data Aps
This file is part of the YAZ toolkit.
@@ -104,9 +104,9 @@ static void cql_to_xml_mod(struct cql_node *m,
pr_n("\n", pr, client_data, 0);
if (m->u.st.relation)
{
- pr_n("", pr, client_data, level+4);
+ pr_n("", pr, client_data, level+4);
pr_cdata(m->u.st.relation, pr, client_data);
- pr_n("\n", pr, client_data, 0);
+ pr_n("\n", pr, client_data, 0);
}
if (m->u.st.term)
{
@@ -163,6 +163,16 @@ static void cql_to_xml_r(struct cql_node *cn,
pr_cdata(cn->u.st.term, pr, client_data);
pr_n("\n", pr, client_data, 0);
}
+ if (cn->u.st.extra_terms)
+ {
+ struct cql_node *n = cn->u.st.extra_terms;
+ for (; n; n = n->u.st.extra_terms)
+ {
+ pr_n("", pr, client_data, level+2);
+ pr_cdata(n->u.st.term, pr, client_data);
+ pr_n("\n", pr, client_data, 0);
+ }
+ }
pr_n("\n", pr, client_data, level);
break;
case CQL_NODE_BOOL: