X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fxcqlutil.c;h=de6116cf1126cd4150e9e3c403c627656440ecf6;hp=da6976a0a87b9e86184ad13c2d01c2140dad3253;hb=9084e20f4c5ffad9cfea2087396206b75a3a6654;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0

diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index da6976a..de6116c 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,12 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
-
 /**
  * \file xcqlutil.c
  * \brief Implements CQL to XCQL conversion.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -14,7 +16,7 @@
 
 #include <yaz/cql.h>
 
-static void pr_n(const char *buf, 
+static void pr_n(const char *buf,
                 void (*pr)(const char *buf, void *client_data),
                 void *client_data, int n)
 {
@@ -51,7 +53,7 @@ static void pr_cdata(const char *buf,
         src++;
     }
 }
-                    
+
 static void prefixes(struct cql_node *cn,
                      void (*pr)(const char *buf, void *client_data),
                      void *client_data, int level)
@@ -84,7 +86,7 @@ static void prefixes(struct cql_node *cn,
     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)
@@ -116,9 +118,36 @@ static void cql_to_xml_mod(struct cql_node *m,
     }
 }
 
+static void cql_sort_to_xml(struct cql_node *cn,
+                         void (*pr)(const char *buf, void *client_data),
+                            void *client_data, int level)
+{
+    if (cn)
+    {
+        pr_n("<sortKeys>\n", pr, client_data, level);
+        for (; cn; cn = cn->u.sort.next)
+        {
+            pr_n("<key>\n", pr, client_data, level+2);
+
+            if (cn->u.sort.index)
+            {
+                pr_n("<index>", pr, client_data, level+4);
+                pr_cdata(cn->u.sort.index, pr, client_data);
+                pr_n("</index>\n", pr, client_data, 0);
+
+                cql_to_xml_mod(cn->u.sort.modifiers,
+                               pr, client_data, level+6);
+            }
+            pr_n("</key>\n", pr, client_data, level+2);
+        }
+        pr_n("</sortKeys>\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)
+                         void *client_data, int level,
+                         struct cql_node *sort_node)
 {
     if (!cn)
         return;
@@ -159,16 +188,7 @@ 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);
-            }
-        }
+        cql_sort_to_xml(sort_node, pr, client_data, level+2);
         pr_n("</searchClause>\n", pr, client_data, level);
         break;
     case CQL_NODE_BOOL:
@@ -189,24 +209,28 @@ static void cql_to_xml_r(struct cql_node *cn,
         if (cn->u.boolean.left)
         {
             printf ("%*s<leftOperand>\n", level+2, "");
-            cql_to_xml_r(cn->u.boolean.left, pr, client_data, level+4);
+            cql_to_xml_r(cn->u.boolean.left, pr, client_data, level+4, 0);
             printf ("%*s</leftOperand>\n", level+2, "");
         }
         if (cn->u.boolean.right)
         {
             printf ("%*s<rightOperand>\n", level+2, "");
-            cql_to_xml_r(cn->u.boolean.right, pr, client_data, level+4);
+            cql_to_xml_r(cn->u.boolean.right, pr, client_data, level+4, 0);
             printf ("%*s</rightOperand>\n", level+2, "");
         }
+        cql_sort_to_xml(sort_node, pr, client_data, level+2);
         pr_n("</triple>\n", pr, client_data, level);
+        break;
+    case CQL_NODE_SORT:
+        cql_to_xml_r(cn->u.sort.search, pr, client_data, level, cn);
     }
 }
 
-void cql_to_xml(struct cql_node *cn, 
+void cql_to_xml(struct cql_node *cn,
                 void (*pr)(const char *buf, void *client_data),
                 void *client_data)
 {
-    cql_to_xml_r(cn, pr, client_data, 0);
+    cql_to_xml_r(cn, pr, client_data, 0, 0);
 }
 
 void cql_to_xml_stdio(struct cql_node *cn, FILE *f)
@@ -242,6 +266,7 @@ int cql_to_xml_buf(struct cql_node *cn, char *out, int max)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab