X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fxcqlutil.c;h=99327c564f993138752da3b73fe02b308d9c62a4;hb=e858b0c178feedf5ef60bf6e66956ef5c4fd0b83;hp=cad5907eba6643872c4ad92441ce3eb937862bcd;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index cad5907..99327c5 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,4 +1,4 @@
-/* $Id: xcqlutil.c,v 1.7 2007-01-03 08:42:15 adam Exp $
+/* $Id: xcqlutil.c,v 1.9 2008-01-06 16:22:02 adam Exp $
    Copyright (C) 1995-2007, Index Data ApS
    Index Data Aps
 
@@ -104,9 +104,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 +163,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: