X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fxcqlutil.c;h=9eca708fdd81d715ec53e12f30ea00773d2b109b;hp=b884b6ec85b6300dffb5950a72e2efd344b9ec71;hb=cf30376bd9e43ad653c6292f275ee4dd10b70a6c;hpb=42f18e58ed67f77727cde23bcee44dbd32ed242a

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index b884b6e..9eca708 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,11 +1,17 @@
-/* $Id: xcqlutil.c,v 1.2 2004-03-10 16:34:29 adam Exp $
-   Copyright (C) 2002-2004
+/* $Id: xcqlutil.c,v 1.8 2007-06-28 07:58:07 adam Exp $
+   Copyright (C) 1995-2007, 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,58 +60,63 @@ 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.st.modifiers)
-        {
-            pr_n("<prefix>\n", pr, client_data, level+2);
-            if (cn->u.st.index)
-            {
-                pr_n("<name>", pr, client_data, level+4);
-                pr_cdata(cn->u.st.index, pr, client_data);
-                pr_n("</name>\n", pr, client_data, 0);
-            }
-            if (cn->u.st.term)
-            {
-                pr_n("<identifier>", pr, client_data, level+4);
-                pr_cdata(cn->u.st.term, 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)
+                           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);
+        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("<comparison>", pr, client_data, level+4);
+                pr_cdata(m->u.st.relation, pr, client_data);
+                pr_n("</comparison>\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);
     }
 }
 
@@ -119,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);
@@ -130,11 +141,19 @@ static void cql_to_xml_r(struct cql_node *cn,
         {
             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);
 
-	    cql_to_xml_mod(cn->u.st.modifiers,
-			   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);
         }
@@ -148,7 +167,6 @@ 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)
         {
             pr_n("<boolean>\n", pr, client_data, level+2);
@@ -157,8 +175,8 @@ static void cql_to_xml_r(struct cql_node *cn,
             pr_cdata(cn->u.boolean.value, pr, client_data);
             pr_n("</value>\n", pr, client_data, 0);
 
-	    cql_to_xml_mod(cn->u.boolean.modifiers,
-			   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);
         }
@@ -215,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
+ */
+