X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fxcqlutil.c;h=da6976a0a87b9e86184ad13c2d01c2140dad3253;hb=4ce7bffcae2b1faaa0fb5d74eca9aeeb7f6d0c6e;hp=70ecbde8f26c1de41410afa1a1b426eb68ede013;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 70ecbde..da6976a 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-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("</type>\n", pr, client_data, 0);
             if (m->u.st.relation)
             {
-                pr_n("<relation>", pr, client_data, level+4);
+                pr_n("<comparison>", pr, client_data, level+4);
                 pr_cdata(m->u.st.relation, pr, client_data);
-                pr_n("</relation>\n", pr, client_data, 0);
+                pr_n("</comparison>\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("</term>\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("<term>", pr, client_data, level+2);
+                pr_cdata(n->u.st.term, pr, client_data);
+                pr_n("</term>\n", pr, client_data, 0);
+            }
+        }
         pr_n("</searchClause>\n", pr, client_data, level);
         break;
     case CQL_NODE_BOOL: