From ccd455108d07e200aa011fdbbe60d07eb7144dc4 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 2 Oct 2010 15:15:06 +0200
Subject: [PATCH] Sorted input xml by id.

---
 configure.ac        |   3 +-
 src/dbtransformer.c |  89 ++++++++++++++++++++++++++++++++++++++++++++
 tests/test.db       | Bin 7168 -> 7168 bytes
 tests/test.xml      |  24 ++++++------
 4 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2866069..03b251a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,8 @@ AC_PROG_RANLIB
 GTK_DOC_CHECK
 
 # Checks for libraries.
-PKG_CHECK_MODULES(DBT, [libgda-4.0 >= 4.1.8])
+PKG_CHECK_MODULES(DBT, [libgda-4.0 >= 4.1.8
+                        libxslt >= 1.0.0])
 
 AC_SUBST(DBT_CFLAGS)
 AC_SUBST(DBT_LIBS)
diff --git a/src/dbtransformer.c b/src/dbtransformer.c
index 0e54972..3619526 100644
--- a/src/dbtransformer.c
+++ b/src/dbtransformer.c
@@ -20,12 +20,36 @@
 	#include <config.h>
 #endif
 
+#include <string.h>
+
 #include <libxml/xpath.h>
 #include <libxml/xinclude.h>
+
+#include <libxslt/xslt.h>
+#include <libxslt/xsltInternals.h>
+#include <libxslt/transform.h>
+
 #include <sql-parser/gda-sql-parser.h>
 
 #include "libdbtransformer.h"
 
+gchar *str_xslt_doc =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<xsl:stylesheet version=\"1.0\"\n"
+"xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\n"
+"<xsl:template match=\"/\">\n"
+"<dbtransformer>\n"
+"	<xsl:for-each select=\"dbtransformer/dbtransformation\">\n"
+"		<xsl:sort select=\"@id\" data-type=\"number\"/>\n"
+"		<xsl:text>&#10;</xsl:text>\n"
+"		<xsl:text>&#09;</xsl:text>\n"
+"		<xsl:copy-of select=\".\"/>\n"
+"	</xsl:for-each>\n"
+"<xsl:text>&#10;</xsl:text>\n"
+"</dbtransformer>\n"
+"</xsl:template>\n"
+"</xsl:stylesheet>";
+
 static void dbt_class_init (DbtClass *class);
 static void dbt_init (Dbt *dbt);
 
@@ -190,6 +214,65 @@ dbt_check_xml_root (xmlNodePtr xml_root)
 		}
 }
 
+static gboolean
+dbt_sort_xml (Dbt *dbt)
+{
+	gboolean ret;
+
+	DbtPrivate *priv;
+
+	xmlDocPtr xslt_xdoc;
+	xsltStylesheetPtr xslt;
+
+	ret = FALSE;
+
+	priv = DBT_GET_PRIVATE (dbt);
+
+	xmlSubstituteEntitiesDefault (1);
+
+	xslt_xdoc = xmlParseMemory (str_xslt_doc, strlen (str_xslt_doc));
+	if (xslt_xdoc == NULL)
+		{
+			g_warning ("Unable to parse the XSLT doc.");
+			return ret;
+		}
+
+	xslt = xsltParseStylesheetDoc (xslt_xdoc);
+	if (xslt == NULL)
+		{
+			g_warning ("Unable to parse the XSLT doc.");
+			return ret;
+		}
+
+	priv->xml_doc = xsltApplyStylesheet (xslt, priv->xml_doc, NULL);
+	if (priv->xml_doc == NULL)
+		{
+			g_warning ("Unable to apply the XSLT.");
+			return ret;
+		}
+
+	priv->xml_root = xmlDocGetRootElement (priv->xml_doc);
+	if (priv->xml_root == NULL)
+		{
+			g_warning ("No root node after applied the XSLT.");
+			return ret;
+		}
+
+	if (!dbt_check_xml_root (priv->xml_root))
+		{
+			priv->xml_root = NULL;
+
+			g_warning ("No root node after applied the XSLT.");
+			return ret;
+		}
+
+	ret = TRUE;
+
+	xsltFreeStylesheet (xslt);
+
+	return ret;
+}
+
 /**
  * dbt_set_xml:
  * @dbt:
@@ -210,6 +293,7 @@ dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root)
 	if (!dbt_check_xml_root (priv->xml_root))
 		{
 			priv->xml_root = NULL;
+			return;
 		}
 	else
 		{
@@ -223,6 +307,8 @@ dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root)
 					g_warning ("Unable to include xml external files.");
 				}
 		}
+
+	dbt_sort_xml (dbt);
 }
 /**
  * dbt_set_xml_from_filename:
@@ -275,7 +361,10 @@ dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename)
 	if (!dbt_check_xml_root (priv->xml_root))
 		{
 			priv->xml_root = NULL;
+			return;
 		}
+
+	dbt_sort_xml (dbt);
 }
 
 static gboolean
diff --git a/tests/test.db b/tests/test.db
index a61c14bdd724eae9870c1869037efd63015b5f5e..322af8aa49d930074467737ddbc8389516afd20f 100644
GIT binary patch
delta 907
zcmZp$Xt0<dEvU=Dz`zc~EI`Z%#3mDUjKy^sbRS9a0(nf#P7KTkn4K73g5bo)2Qo~~
z43otrB^ev5OA?cEQuB*aQj3ZqB-`Xbrb;Hp$jNV*6dBnk^D&#q0FC$$RvnL3wd3Rk
zOdd{-A+8D`j!r(V3duQ{sd**E3L2Ry3YmE&sp+XjItqD-xv2_eiABj7iA5Tw2AVnw
z&i;PEAwiCwej!jDlQ%F)Y<6Pa$0EQA@&@y7Aj!ba{F{+`V&iYNLKYT=#`MW+IAz0&
z3v=waI5{~TeL`G=pq4@$ui)t70yNks)Yng;B)=pvM<FG@6zD;qY8!osHXHqvq>`e<
zyyCR{qTIxi%=|pNMr~#mhNkGrQCzZ<PjdFiFtIR9^0h%%rjVIpt7J5}kZS@5Ym*Wq
z3qy<NWKM2bUzls0gIuW-2BJu=<+Onr4~!O2Kx^nB$)frN7+P$g1ONk|1i`*pP~bE3
zW@eGU%#(Oncvu*@8JKP}=`hxf1}Z28!2*>77O0b7aZ9l=GW}y<`nOq-<qMNsV?8S{
WrkSy)2Ghw3-0PTuNqh2HZesw}y8^}l

delta 292
zcmZp$Xt0<dEy&3L0qj7E35dBT>KKc2GUz^%;05xSnO-n3A7FN3dcpXT@#SVgmQqGT
z#z<LN#>|q$q@2{e)N&M>%{j=`F~n6N#L>yeRRJbDS&K<pijh}bQj)Q;8mvCQC?&P1
z7(%j6j%RY5yqVEr@+l@cmI!7x@yTx)6&YD3^D~)jc4FSg!UuK;<5Hkwn1UIX0v$1(
zk-1TuWpX2@6r;)HIh>OinJ4RWNiiBv_Trkr!PZ#K$imQEJz0=bjLA@Ga)PwNWLxRp
u$;UYbCf}1*nk2%qnT6#K^CA|Oi2*>Sz#nE2NC+@60%=w#W&>LDh8Y0o|3``d

diff --git a/tests/test.xml b/tests/test.xml
index 2abf1cd..944aef8 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <dbtransformer>
 
-	<dbtransformation id="1">
+	<dbtransformation id="5">
 		<drop_table>
 			<table_name>clients</table_name>
 		</drop_table>
@@ -9,11 +9,11 @@
 			<table_name>orders</table_name>
 		</drop_table>
 		<drop_table>
-			<table_name>newtable</table_name>
+			<table_name>newtablename</table_name>
 		</drop_table>
 	</dbtransformation>
 
-	<!--<dbtransformation id="1">
+	<dbtransformation id="1">
 		<sql>
 			CREATE TABLE clients (id integer, name varchar(50), CONSTRAINT clients_pkey PRIMARY KEY (id))
 		</sql>
@@ -22,13 +22,20 @@
 		</sql>
 	</dbtransformation>
 
-	<dbtransformation id="2">
+	<dbtransformation id="4">
 		<sql>
 			ALTER TABLE orders ADD COLUMN total double
 		</sql>
-	</dbtransformation>-->
+	</dbtransformation>
 
 	<dbtransformation id="3">
+		<rename_table>
+			<table_name>newtable</table_name>
+			<new_table_name>newtablename</new_table_name>
+		</rename_table>
+	</dbtransformation>
+
+	<dbtransformation id="2">
 		<gda_op>
 			<serv_op_data type="CREATE_TABLE">
 				<op_data path="/TABLE_DEF_P/TABLE_NAME">newtable</op_data>
@@ -56,11 +63,4 @@
 		</gda_op>
 	</dbtransformation>
 
-	<dbtransformation id="4">
-		<rename_table>
-			<table_name>newtable</table_name>
-			<new_table_name>newtablename</new_table_name>
-		</rename_table>
-	</dbtransformation>
-
 </dbtransformer>
-- 
2.49.0