From b2e216a7f23af375021c94a03cb237c492d72d24 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Wed, 31 Jan 2001 20:45:01 +0000
Subject: [PATCH] Test/debug/patch  cycle: - tests/REC/test-[9-10]*: added more
 tests - tests/REC2/html.xml libxslt/xsltutils.c libxslt/transform.c:   fixed
 sorting Daniel

---
 ChangeLog                |  6 ++++++
 libxslt/transform.c      | 15 ++++++++++++---
 libxslt/xsltutils.c      |  3 ++-
 tests/REC/test-10-1.xml  | 20 ++++++++++++++++++++
 tests/REC/test-10-1.xsl  | 20 ++++++++++++++++++++
 tests/REC/test-9.1-2.out |  9 +++++++++
 tests/REC/test-9.1-2.xml |  8 ++++++++
 tests/REC/test-9.1-2.xsl | 31 +++++++++++++++++++++++++++++++
 tests/REC2/html.xml      | 12 ++++++------
 9 files changed, 114 insertions(+), 10 deletions(-)
 create mode 100644 tests/REC/test-10-1.xml
 create mode 100644 tests/REC/test-10-1.xsl
 create mode 100644 tests/REC/test-9.1-2.out
 create mode 100644 tests/REC/test-9.1-2.xml
 create mode 100644 tests/REC/test-9.1-2.xsl

diff --git a/ChangeLog b/ChangeLog
index 4177c31..b0c23ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 31 21:42:43 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* tests/REC/test-[9-10]*: added more tests
+	* tests/REC2/html.xml libxslt/xsltutils.c libxslt/transform.c:
+	  fixed sorting
+
 Wed Jan 31 19:25:38 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* tests/REC/test-[7-9]*: added more tests
diff --git a/libxslt/transform.c b/libxslt/transform.c
index 83630e0..12cde9a 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -246,6 +246,7 @@ xsltSort(xsltTransformContextPtr ctxt, xmlNodePtr node,
     int number = 0;
     int len = 0;
     int i;
+    xmlNodePtr oldNode;
 
     if ((ctxt == NULL) || (node == NULL) || (inst == NULL))
 	return;
@@ -307,11 +308,13 @@ xsltSort(xsltTransformContextPtr ctxt, xmlNodePtr node,
     }
 
     start = xpathParserCtxt->cur;
+    oldNode = ctxt->node;
     for (i = 0;i < len;i++) {
 	xpathParserCtxt->cur = start;
-	node = ctxt->node = list->nodeTab[i];
+	ctxt->xpathCtxt->contextSize = len;
 	ctxt->xpathCtxt->proximityPosition = i + 1;
-	valuePush(xpathParserCtxt, xmlXPathNewNodeSet(node));
+	ctxt->node = list->nodeTab[i];
+	ctxt->xpathCtxt->node = ctxt->node;
 	xmlXPathEvalExpr(xpathParserCtxt);
 	xmlXPathStringFunction(xpathParserCtxt, 1);
 	if (number)
@@ -348,6 +351,7 @@ xsltSort(xsltTransformContextPtr ctxt, xmlNodePtr node,
 	    }
 	}
     }
+    ctxt->node = oldNode;
 
     xsltSortFunction(list, &results[0], descending, number);
 
@@ -1094,9 +1098,14 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
      * handle and skip the xsl:sort
      */
     replacement = inst->children;
-    while (IS_XSLT_ELEM(replacement) && (IS_XSLT_NAME(replacement, "sort"))) {
+    if (IS_XSLT_ELEM(replacement) && (IS_XSLT_NAME(replacement, "sort"))) {
 	xsltSort(ctxt, node, replacement);
 	replacement = replacement->next;
+	while (IS_XSLT_ELEM(replacement) &&
+	       (IS_XSLT_NAME(replacement, "sort"))) {
+	    TODO /* imbricated sorts */
+	    replacement = replacement->next;
+	}
     }
 
     for (i = 0;i < list->nodeNr;i++) {
diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
index 9d787d1..f506071 100644
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -236,7 +236,8 @@ xsltSortFunction(xmlNodeSetPtr list, xmlXPathObjectPtr *results,
 		if (descending)
 		    tst = !tst;
 	    } else {
-		tst = xmlStrcmp(results[i]->stringval, results[j]->stringval);
+		tst = (xmlStrcmp(results[i]->stringval,
+			         results[j]->stringval)) > 0; 
 		if (descending)
 		    tst = !tst;
 	    }
diff --git a/tests/REC/test-10-1.xml b/tests/REC/test-10-1.xml
new file mode 100644
index 0000000..e46e71d
--- /dev/null
+++ b/tests/REC/test-10-1.xml
@@ -0,0 +1,20 @@
+<employees>
+  <employee>
+    <name>
+      <given>James</given>
+      <family>Clark</family>
+    </name>
+  </employee>
+  <employee>
+    <name>
+      <given>Daniel</given>
+      <family>Veillard</family>
+    </name>
+  </employee>
+  <employee>
+    <name>
+      <given>Michael</given>
+      <family>Kay</family>
+    </name>
+  </employee>
+</employees>
diff --git a/tests/REC/test-10-1.xsl b/tests/REC/test-10-1.xsl
new file mode 100644
index 0000000..613c4f3
--- /dev/null
+++ b/tests/REC/test-10-1.xsl
@@ -0,0 +1,20 @@
+<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:template match="employees">
+  <ul>
+    <xsl:apply-templates select="employee">
+      <xsl:sort select="name/family"/>
+      <xsl:sort select="name/given"/>
+    </xsl:apply-templates>
+  </ul>
+</xsl:template>
+
+<xsl:template match="employee">
+  <li>
+    <xsl:value-of select="name/given"/>
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="name/family"/>
+  </li>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/tests/REC/test-9.1-2.out b/tests/REC/test-9.1-2.out
new file mode 100644
index 0000000..6e03f46
--- /dev/null
+++ b/tests/REC/test-9.1-2.out
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><table><tbody>
+<tr>item1</tr>
+<tr bgcolor="yellow">item2</tr>
+<tr>item3</tr>
+<tr bgcolor="yellow">item4</tr>
+<tr>item5</tr>
+<tr bgcolor="yellow">item6</tr>
+</tbody></table></body></html>
diff --git a/tests/REC/test-9.1-2.xml b/tests/REC/test-9.1-2.xml
new file mode 100644
index 0000000..846e3fa
--- /dev/null
+++ b/tests/REC/test-9.1-2.xml
@@ -0,0 +1,8 @@
+<itemlist>
+  <item>item1</item>
+  <item>item2</item>
+  <item>item3</item>
+  <item>item4</item>
+  <item>item5</item>
+  <item>item6</item>
+</itemlist>
diff --git a/tests/REC/test-9.1-2.xsl b/tests/REC/test-9.1-2.xsl
new file mode 100644
index 0000000..3bb0204
--- /dev/null
+++ b/tests/REC/test-9.1-2.xsl
@@ -0,0 +1,31 @@
+<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<xsl:strip-space elements="itemlist"/>
+
+<xsl:template match="/">
+<html>
+<body>
+<xsl:apply-templates/>
+</body>
+</html>
+</xsl:template>
+
+<xsl:template match="itemlist">
+<table>
+<tbody>
+<xsl:apply-templates/>
+</tbody>
+</table>
+</xsl:template>
+
+<xsl:template match="item">
+  <tr>
+    <xsl:if test="position() mod 2 = 0">
+       <xsl:attribute name="bgcolor">yellow</xsl:attribute>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </tr>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/tests/REC2/html.xml b/tests/REC2/html.xml
index ad34859..332dd05 100644
--- a/tests/REC2/html.xml
+++ b/tests/REC2/html.xml
@@ -9,6 +9,12 @@
 <th>Bonus</th>
 </tr>
 <tr>
+<td><em>North</em></td>
+<td>10</td>
+<td>9</td>
+<td>7</td>
+</tr>
+<tr>
 <td><em>West</em></td>
 <td>6</td>
 <td style="color:red">-1.5</td>
@@ -20,11 +26,5 @@
 <td>3</td>
 <td>4</td>
 </tr>
-<tr>
-<td><em>North</em></td>
-<td>10</td>
-<td>9</td>
-<td>7</td>
-</tr>
 </table></body>
 </html>
-- 
2.7.4