X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fxcqlutil.c;h=da6976a0a87b9e86184ad13c2d01c2140dad3253;hb=966a14020bc5855bbc4f3aebaa157f5c6d4ae292;hp=cad5907eba6643872c4ad92441ce3eb937862bcd;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git
diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index cad5907..da6976a 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,11 +1,7 @@
-/* $Id: xcqlutil.c,v 1.7 2007-01-03 08:42:15 adam Exp $
- Copyright (C) 1995-2007, Index Data ApS
- Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
/**
* \file xcqlutil.c
@@ -104,9 +100,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 +159,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: