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

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 9c38de1..70ecbde 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,11 +1,17 @@
-/* $Id: xcqlutil.c,v 1.1 2003-10-27 12:21:36 adam Exp $
-   Copyright (C) 2002-2003
+/* $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.
 */
+
+/**
+ * \file xcqlutil.c
+ * \brief Implements CQL to XCQL conversion.
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -54,30 +60,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)
+        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("<prefix>\n", pr, client_data, level+2);
-            if (cn->u.mod.name)
+            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("<name>", pr, client_data, level+4);
-                pr_cdata(cn->u.mod.name, pr, client_data);
-                pr_n("</name>\n", pr, client_data, 0);
+                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 (cn->u.mod.value)
+            if (m->u.st.term)
             {
-                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("<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("</prefix>\n", pr, client_data, level+2);
+            pr_n("</modifier>\n", pr, client_data, level+2);
         }
-        pr_n("</prefixes>\n", pr, client_data, level);
+        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 +130,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 +139,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)
+
+            if (cn->u.st.relation_uri)
             {
-                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);
+                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 +167,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)
@@ -208,3 +233,11 @@ int cql_to_xml_buf(struct cql_node *cn, char *out, int max)
     return info.off;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+