X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fxcqlutil.c;h=abbd8790aa00eb5609e7b3c5cd84243043328dd5;hb=df76df087008d3d53a68958b31a018a3e292791a;hp=70ecbde8f26c1de41410afa1a1b426eb68ede013;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git
diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 70ecbde..abbd879 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,11 +1,7 @@
-/* $Id: xcqlutil.c,v 1.6 2005-06-25 15:46:06 adam Exp $
- Copyright (C) 1995-2005, 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-2009 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:
@@ -236,6 +242,7 @@ int cql_to_xml_buf(struct cql_node *cn, char *out, int max)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab