X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fxcqlutil.c;h=45815b0d14fb81a3f45ce50c4ad4f6618c110c3e;hb=719e0dcf2d15c08086a06457701e21c6aff3d791;hp=9c38de1c06d803fa0a2068cc177bbee41b72d788;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 9c38de1..45815b0 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,5 +1,5 @@
-/* $Id: xcqlutil.c,v 1.1 2003-10-27 12:21:36 adam Exp $
-   Copyright (C) 2002-2003
+/* $Id: xcqlutil.c,v 1.3 2004-03-15 21:39:06 adam Exp $
+   Copyright (C) 2002-2004
    Index Data Aps
 
 This file is part of the YAZ toolkit.
@@ -54,30 +54,66 @@ static void prefixes(struct cql_node *cn,
                      void (*pr)(const char *buf, void *client_data),
                      void *client_data, int level)
 {
-    if (cn)
+    int head = 0;
+    if (cn->u.st.index_uri)
     {
         pr_n("<prefixes>\n", pr, client_data, level);
-        for (; cn; cn = cn->u.mod.next)
-        {
-            pr_n("<prefix>\n", pr, client_data, level+2);
-            if (cn->u.mod.name)
-            {
-                pr_n("<name>", pr, client_data, level+4);
-                pr_cdata(cn->u.mod.name, pr, client_data);
-                pr_n("</name>\n", pr, client_data, 0);
-            }
-            if (cn->u.mod.value)
-            {
-                pr_n("<identifier>", pr, client_data, level+4);
-                pr_cdata(cn->u.mod.value, pr, client_data);
-                pr_n("</identifier>\n", pr, client_data, 0);
-            }
-            pr_n("</prefix>\n", pr, client_data, level+2);
-        }
-        pr_n("</prefixes>\n", pr, client_data, level);
+	head = 1;
+
+	pr_n("<prefix>\n", pr, client_data, level+2);
+	pr_n("<identifier>", pr, client_data, level+4);
+	pr_cdata(cn->u.st.index_uri, pr, client_data);
+	pr_n("</identifier>\n", pr, client_data, 0);
+	pr_n("</prefix>\n", pr, client_data, level+2);
     }
+    if (cn->u.st.relation_uri && cn->u.st.relation)
+    {
+	if (!head)
+	    pr_n("<prefixes>\n", pr, client_data, level);
+	pr_n("<prefix>\n", pr, client_data, level+2);
+	pr_n("<name>", pr, client_data, level+4);
+	pr_cdata("rel", pr, client_data);
+	pr_n("</name>\n", pr, client_data, 0);
+	pr_n("<identifier>", pr, client_data, level+4);
+	pr_cdata(cn->u.st.relation_uri, pr, client_data);
+	pr_n("</identifier>\n", pr, client_data, 0);
+	pr_n("</prefix>\n", pr, client_data, level+2);
+    }
+    if (head)
+        pr_n("</prefixes>\n", pr, client_data, level);
 }
                      
+static void cql_to_xml_mod(struct cql_node *m,
+			   void (*pr)(const char *buf, void *client_data),
+			   void *client_data, int level)
+{
+    if (m)
+    {
+	pr_n("<modifiers>\n", pr, client_data, level);
+	for (; m; m = m->u.st.modifiers)
+	{
+	    pr_n("<modifier>\n", pr, client_data, level+2);
+	    pr_n("<type>", pr, client_data, level+4);
+	    pr_cdata(m->u.st.index, pr, client_data);
+	    pr_n("</type>\n", pr, client_data, 0);
+	    if (m->u.st.relation)
+	    {
+		pr_n("<relation>", pr, client_data, level+4);
+		pr_cdata(m->u.st.relation, pr, client_data);
+		pr_n("</relation>\n", pr, client_data, 0);
+	    }
+	    if (m->u.st.term)
+	    {
+		pr_n("<value>", pr, client_data, level+4);
+		pr_cdata(m->u.st.term, pr, client_data);
+		pr_n("</value>\n", pr, client_data, 0);
+	    }
+	    pr_n("</modifier>\n", pr, client_data, level+2);
+	}
+	pr_n("</modifiers>\n", pr, client_data, level);
+    }
+}
+
 static void cql_to_xml_r(struct cql_node *cn,
                          void (*pr)(const char *buf, void *client_data),
                          void *client_data, int level)
@@ -88,7 +124,7 @@ static void cql_to_xml_r(struct cql_node *cn,
     {
     case CQL_NODE_ST:
         pr_n("<searchClause>\n", pr, client_data, level);
-        prefixes(cn->u.st.prefixes, pr, client_data, level+2);
+        prefixes(cn, pr, client_data, level+2);
         if (cn->u.st.index)
         {
             pr_n("<index>", pr, client_data, level+2);
@@ -97,22 +133,22 @@ static void cql_to_xml_r(struct cql_node *cn,
         }
         if (cn->u.st.relation)
         {
-            struct cql_node *m = cn->u.st.modifiers;
             pr_n("<relation>\n", pr, client_data, level+2);
             pr_n("<value>", pr, client_data, level+4);
+	    if (cn->u.st.relation_uri)
+		pr_cdata("rel.", pr, client_data);
             pr_cdata(cn->u.st.relation, pr, client_data);
             pr_n("</value>\n", pr, client_data, 0);
-            if (m)
-            {
-                pr_n("<modifiers>\n", pr, client_data, level+4);
-                for (; m; m = m->u.mod.next)
-                {
-                    pr_n("<modifier><value>", pr, client_data, level+6);
-                    pr_cdata(m->u.mod.value, pr, client_data);
-                    pr_n("</value></modifier>\n", pr, client_data, 0);
-                }
-                pr_n("</modifiers>\n", pr, client_data, level+4);
-            }
+
+	    if (cn->u.st.relation_uri)
+	    {
+		pr_n("<identifier>", pr, client_data, level+4);
+		pr_cdata(cn->u.st.relation_uri, pr, client_data);
+		pr_n("</identifier>\n", pr, client_data, 0);
+	    }
+	    cql_to_xml_mod(cn->u.st.modifiers,
+			   pr, client_data, level+4);
+
             pr_n("</relation>\n", pr, client_data, level+2);
         }
         if (cn->u.st.term)
@@ -125,34 +161,17 @@ static void cql_to_xml_r(struct cql_node *cn,
         break;
     case CQL_NODE_BOOL:
         pr_n("<triple>\n", pr, client_data, level);
-        prefixes(cn->u.st.prefixes, pr, client_data, level+2);
         if (cn->u.boolean.value)
         {
-            struct cql_node *m = cn->u.boolean.modifiers;
             pr_n("<boolean>\n", pr, client_data, level+2);
 
             pr_n("<value>", pr, client_data, level+4);
             pr_cdata(cn->u.boolean.value, pr, client_data);
             pr_n("</value>\n", pr, client_data, 0);
 
-            if (m)
-            {
-                pr_n("<modifiers>\n", pr, client_data, level+4);
-                for (; m; m = m->u.mod.next)
-                {
-                    pr_n("<modifier><type>", pr, client_data, level+6);
-                    pr_cdata(m->u.mod.name, pr, client_data);
-                    pr_n("</type>", pr, client_data, 0);
-                    if (m->u.mod.value)
-                    {
-                        pr_n("<value>", pr, client_data, 0);
-                        pr_cdata(m->u.mod.value, pr, client_data);
-                        pr_n("</value>", pr, client_data, 0);
-                    }
-                    pr_n("</modifier>\n", pr, client_data, 0);
-                }
-                pr_n("</modifiers>\n", pr, client_data, level+4);
-            }
+	    cql_to_xml_mod(cn->u.boolean.modifiers,
+			   pr, client_data, level+4);
+
             pr_n("</boolean>\n", pr, client_data, level+2);
         }
         if (cn->u.boolean.left)