You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2025/05/03 07:30:28 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing fix for xsl:for-each-group instruction w3c xslt3 test case for-each-group-043
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_xslt3.0_mvn
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_xslt3.0_mvn by this push:
new 435236ddd committing fix for xsl:for-each-group instruction w3c xslt3 test case for-each-group-043
435236ddd is described below
commit 435236ddd20fe568b5b913ea64244724e8d7c7b0
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat May 3 13:00:11 2025 +0530
committing fix for xsl:for-each-group instruction w3c xslt3 test case for-each-group-043
---
README | 8 +-
.../apache/xalan/processor/XSLTAttributeDef.java | 2 +-
.../apache/xalan/templates/ElemForEachGroup.java | 27 ++--
.../xslt/util/XslTransformEvaluationHelper.java | 6 +-
.../org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java | 3 +
.../xpath/axes/FilterExprIteratorSimple.java | 154 +++++++++++++++++++--
.../tests/xslt3/W3c_xslt30_ForEachGroupTests.java | 10 ++
.../insn/for_each_group/gold/test4.out | 28 ++++
.../insn/for_each_group/test3.xsl | 10 +-
.../insn/for_each_group/test4.xml | 12 ++
.../insn/for_each_group/test4.xsl | 28 ++++
11 files changed, 248 insertions(+), 40 deletions(-)
diff --git a/README b/README
index cbb5436c2..66ac2c9a2 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@
Copyright 1999-2025 The Apache Software Foundation
-Document last modified : 2025-05-02
+Document last modified : 2025-05-03
Authors:
Gary Gregory <gg...@apache.org>
@@ -59,16 +59,16 @@ This produces Maven build output with trailing information like following:
[INFO] T E S T S
[INFO] -------------------------------------------------------
[INFO] Running org.apache.xalan.tests.main.AllXsl3Tests
-[INFO] Tests run: 1035, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.286 s - in org.apache.xalan.tests.main.AllXsl3Tests
+[INFO] Tests run: 1036, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.951 s - in org.apache.xalan.tests.main.AllXsl3Tests
[INFO]
[INFO] Results:
[INFO]
-[INFO] Tests run: 1035, Failures: 0, Errors: 0, Skipped: 0
+[INFO] Tests run: 1036, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:14 min
+[INFO] Total time: 01:19 min
To run Xalan-J's XSL 3 processor for invoking an XSL stylesheet transformation, the jar file xalan-java-3.0.1.jar and other
jar files available within 'libs' folder need to be made available on Java run-time's classpath.
diff --git a/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java b/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
index fb15459ba..d4beb3125 100644
--- a/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
+++ b/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
@@ -1726,7 +1726,7 @@ public class XSLTAttributeDef
String[] strArr = result.split(",");
String firstArrItem = strArr[0];
String lastArrItem = strArr[strArr.length - 1];
- if ((strArr.length > 1) && !(firstArrItem.startsWith("(") || lastArrItem.endsWith(")"))) {
+ if ((strArr.length > 1) && !(firstArrItem.startsWith("(") && lastArrItem.endsWith(")"))) {
result = "(" + result + ")";
}
}
diff --git a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
index 76ad6da1b..1c14a505c 100644
--- a/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
+++ b/src/main/java/org/apache/xalan/templates/ElemForEachGroup.java
@@ -540,10 +540,10 @@ public class ElemForEachGroup extends ElemTemplateElement
if (value instanceof ResultSequence) {
ResultSequence rSeq = (ResultSequence)value;
try {
- // Since a sequence of nodes doesn't refer to an XDM parent element
- // node, we construct here an DTMCursorIterator object that refers
- // to an artificially created XDM parent element for the supplied
- // items within a sequence.
+ // Since a sequence of nodes doesn't refer to a common XDM parent
+ // element node, we construct here an DTMCursorIterator object that
+ // refers to an artificially created XDM common parent element for
+ // the supplied items within a sequence.
sourceNodes = constructSourceNodesFromXdmSequence(xctxt, rSeq);
}
catch (Exception ex) {
@@ -594,9 +594,8 @@ public class ElemForEachGroup extends ElemTemplateElement
xctxt.pushContextNodeList(sourceNodes);
transformer.pushElemTemplateElement(null);
- final Vector sortKeys = (m_sortElems == null)
- ? null : transformer.processSortKeysForEachGroup(
- this, sourceNode);
+ final Vector sortKeys = (m_sortElems == null) ? null : transformer.processSortKeysForEachGroup(
+ this, sourceNode);
if (sortKeys != null) {
/**
* There are xsl:sort elements within xsl:for-each-group. Sort the groups,
@@ -1240,8 +1239,9 @@ public class ElemForEachGroup extends ElemTemplateElement
}
/**
- * Given an XDM sequence as an argument for this method, construct a DTM object
- * and further an DTMCursorIterator instance from the DTM.
+ * Given an XDM sequence as an argument to this method, construct a
+ * DTM object and subsequently an DTMCursorIterator instance from
+ * the DTM object.
*
* @param xctxt XPath context object
* @param rSeq The supplied XDM sequence
@@ -1252,7 +1252,8 @@ public class ElemForEachGroup extends ElemTemplateElement
throws ParserConfigurationException {
DTMCursorIterator sourceNodes = null;
- System.setProperty(org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+ System.setProperty(org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY,
+ org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -1261,7 +1262,7 @@ public class ElemForEachGroup extends ElemTemplateElement
DocumentBuilder dBuilder = dbf.newDocumentBuilder();
Document document = dBuilder.newDocument();
- Element docElem = document.createElement("docElem1"); // arbitrary, chosen document element name
+ Element docElem = document.createElement("docElem1"); // arbitrarily, chosen document element name
for (int idx = 0; idx < rSeq.size(); idx++) {
XObject seqItem = rSeq.item(idx);
XMLNodeCursorImpl xmlNode = (XMLNodeCursorImpl)seqItem;
@@ -1296,8 +1297,8 @@ public class ElemForEachGroup extends ElemTemplateElement
elemNodeHandle = dtm.getNextSibling(elemNodeHandle);
}
- XMLNodeCursorImpl XMLNodeCursorImpl = new XMLNodeCursorImpl(nodeHandleList, xctxt);
- sourceNodes = XMLNodeCursorImpl.iter();
+ XMLNodeCursorImpl xmlNodeCursorImpl = new XMLNodeCursorImpl(nodeHandleList, xctxt);
+ sourceNodes = xmlNodeCursorImpl.iter();
return sourceNodes;
}
diff --git a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
index 872648c30..921344379 100644
--- a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
+++ b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
@@ -240,11 +240,7 @@ public class XslTransformEvaluationHelper {
}
/**
- * Given a ResultSequence object instance, return a corresponding XNodeSet object if
- * all the items within the supplied ResultSequence are xdm nodes.
- *
- * If all the items within the supplied ResultSequence object instance are not xdm nodes,
- * then this method returns a null value.
+ * Method definition to convert an XDM sequence to a node set.
*/
public static XMLNodeCursorImpl getXNodeSetFromResultSequence(ResultSequence resultSeq, DTMManager dtmMgr) {
diff --git a/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java b/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
index c657cc322..bcc3decba 100644
--- a/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
+++ b/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
@@ -785,6 +785,9 @@ public class DOM2DTM extends DTMDefaultBaseIterators
nodeuri = "";
String nodelocalname = node.getLocalName();
+ if (nodelocalname == null) {
+ nodelocalname = node.getNodeName();
+ }
if (nodeuri.equals(namespaceURI) && name.equals(nodelocalname))
return makeNodeHandle(identity);
diff --git a/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java b/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
index 12139f1eb..00fe75bfb 100644
--- a/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
+++ b/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
@@ -20,9 +20,20 @@
*/
package org.apache.xpath.axes;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMSource;
+
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMCursorIterator;
+import org.apache.xml.dtm.DTMManager;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
@@ -32,7 +43,18 @@ import org.apache.xpath.XPathVisitor;
import org.apache.xpath.objects.ResultSequence;
import org.apache.xpath.objects.XMLNodeCursorImpl;
import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XPathArray;
+import org.apache.xpath.objects.XPathInlineFunction;
+import org.apache.xpath.objects.XPathMap;
import org.apache.xpath.types.ForEachGroupCompositeGroupingKey;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+
+import xml.xpath31.processor.types.XSAnyAtomicType;
/**
* Class to use for one-step iteration that doesn't have a predicate, and
@@ -87,14 +109,14 @@ public class FilterExprIteratorSimple extends LocPathIterator
}
/**
- * Execute the expression. Meant for reuse by other FilterExpr iterators
+ * Execute the expression. Meant for reuse by other FilterExpr iterators
* that are not derived from this object.
*/
public static XMLNodeCursorImpl executeFilterExpr(int context, XPathContext xctxt,
- PrefixResolver prefixResolver,
- boolean isTopLevel,
- int stackFrame,
- Expression expr )
+ PrefixResolver prefixResolver,
+ boolean isTopLevel,
+ int stackFrame,
+ Expression expr)
throws org.apache.xml.utils.WrappedRuntimeException
{
PrefixResolver savedResolver = xctxt.getNamespaceContext();
@@ -112,7 +134,6 @@ public class FilterExprIteratorSimple extends LocPathIterator
if (isTopLevel)
{
- // System.out.println("calling m_expr.execute(getXPathContext())");
VariableStack vars = xctxt.getVarStack();
// These three statements need to be combined into one operation.
@@ -126,23 +147,22 @@ public class FilterExprIteratorSimple extends LocPathIterator
}
else {
ForEachGroupCompositeGroupingKey forEachGroupCompositeGroupingKeyObj = (ForEachGroupCompositeGroupingKey)obj1;
- ResultSequence rSeq = forEachGroupCompositeGroupingKeyObj.getValue();
- result = XslTransformEvaluationHelper.getXNodeSetFromResultSequence(rSeq, xctxt);
+ ResultSequence groupingKeySeq = forEachGroupCompositeGroupingKeyObj.getValue();
+ result = getCompositeGroupingKeyNodeset(groupingKeySeq, xctxt);
}
+
result.setShouldCacheNodes(true);
// These two statements need to be combined into one operation.
vars.setStackFrame(savedStart);
}
else
- result = (org.apache.xpath.objects.XMLNodeCursorImpl) expr.execute(xctxt);
+ result = (org.apache.xpath.objects.XMLNodeCursorImpl) expr.execute(xctxt);
}
catch (javax.xml.transform.TransformerException se)
{
-
- // TODO: Fix...
throw new org.apache.xml.utils.WrappedRuntimeException(se);
}
finally
@@ -326,6 +346,116 @@ public class FilterExprIteratorSimple extends LocPathIterator
return Axis.FILTEREDLIST;
}
-
+ /**
+ * Method definition to convert xsl:for-each-group's composite grouping key
+ * sequence to a node set.
+ */
+ private static XMLNodeCursorImpl getCompositeGroupingKeyNodeset(ResultSequence groupingKeySeq, DTMManager dtmMgr)
+ throws TransformerException {
+
+ XMLNodeCursorImpl nodeSet = null;
+
+ System.setProperty(org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY,
+ org.apache.xml.utils.Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ try {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+
+ dbf.setNamespaceAware(true);
+
+ DocumentBuilder dBuilder = dbf.newDocumentBuilder();
+ Document document = dBuilder.newDocument();
+
+ // Generate random XML element name strings, using class java.util.UUID.
+ // Prefixing with an English letter, to make the string a valid XML name.
+ String docElemNameTemp = "a_" + ((UUID.randomUUID()).toString());
+ String elemNameTemp1 = "a_" + (UUID.randomUUID()).toString();
+ String elemNameTemp2 = "a_" + (UUID.randomUUID()).toString();
+
+ Element docElem = document.createElement(docElemNameTemp);
+
+ for (int idx = 0; idx < groupingKeySeq.size(); idx++) {
+ XObject seqItem = groupingKeySeq.item(idx);
+ if (seqItem instanceof XMLNodeCursorImpl) {
+ DTMCursorIterator iter = seqItem.iter();
+ int nodeHandle = iter.nextNode();
+ DTM dtm = dtmMgr.getDTM(nodeHandle);
+ Node node = dtm.getNode(nodeHandle);
+ if (dtm.getNodeType(nodeHandle) == DTM.ELEMENT_NODE) {
+ String nodeName = node.getNodeName();
+ String nodeTxtContent = node.getTextContent();
+ Element elem = document.createElement(nodeName);
+ Text text = document.createTextNode(nodeTxtContent);
+ elem.appendChild(text);
+ docElem.appendChild(elem);
+ }
+ if (dtm.getNodeType(nodeHandle) == DTM.ATTRIBUTE_NODE) {
+ String attrName = node.getNodeName();
+ String attrValue = node.getNodeValue();
+ Element elem = document.createElement(elemNameTemp1);
+ elem.setAttribute(attrName, attrValue);
+ docElem.appendChild(elem);
+ }
+ else if (dtm.getNodeType(nodeHandle) == DTM.TEXT_NODE) {
+ String nodeTxtContent = node.getTextContent();
+ Text text = document.createTextNode(nodeTxtContent);
+ docElem.appendChild(text);
+ }
+ }
+ else if (seqItem instanceof XSAnyAtomicType) {
+ Element elem = document.createElement(elemNameTemp2);
+ String nodeTxtContent = XslTransformEvaluationHelper.getStrVal(seqItem);
+ Text text = document.createTextNode(nodeTxtContent);
+ elem.appendChild(text);
+ docElem.appendChild(elem);
+ }
+ else if ((seqItem instanceof XPathInlineFunction) || (seqItem instanceof XPathMap) || (seqItem instanceof XPathArray)) {
+ throw new TransformerException("XPTY0004 : Cannot convert a sequence to node set, because sequence has one or more function "
+ + "item, map or an array instances.");
+ }
+ }
+
+ document.appendChild(docElem);
+
+ DTM dtm = dtmMgr.getDTM(new DOMSource(document), true, null, false, false);
+ int docNodeHandle = dtm.getDocument();
+
+ int docElemHandle = dtm.getFirstChild(docNodeHandle);
+ int elemNodeHandle = dtm.getFirstChild(docElemHandle);
+ List<Integer> nodeHandleList = new ArrayList<Integer>();
+ while (elemNodeHandle != DTM.NULL) {
+ Element elemNode = (Element)(dtm.getNode(elemNodeHandle));
+ String elemName = elemNode.getNodeName();
+ if (elemNameTemp1.equals(elemName)) {
+ NamedNodeMap namedNodeMap = elemNode.getAttributes();
+ int attrLength = namedNodeMap.getLength();
+ for (int idx = 0; idx < attrLength; idx++) {
+ Attr attr = (Attr)(namedNodeMap.item(idx));
+ int attrNodeHandle = dtm.getAttributeNode(elemNodeHandle, null, attr.getNodeName());
+ nodeHandleList.add(attrNodeHandle);
+ }
+ }
+ else if (elemNameTemp2.equals(elemName)) {
+ int nodeHandle = dtm.getFirstChild(elemNodeHandle);
+ nodeHandleList.add(nodeHandle);
+
+ }
+ else {
+ nodeHandleList.add(elemNodeHandle);
+ }
+
+ elemNodeHandle = dtm.getNextSibling(elemNodeHandle);
+ }
+
+ nodeSet = new XMLNodeCursorImpl(nodeHandleList, dtmMgr);
+ }
+ catch (Exception ex) {
+ throw new TransformerException("XPTY0004 : An error occured while converting a sequence to node set, "
+ + "with following error trace : " + ex.getMessage() + ".");
+ }
+
+ return nodeSet;
+ }
+
}
diff --git a/src/test/java/org/apache/xalan/tests/xslt3/W3c_xslt30_ForEachGroupTests.java b/src/test/java/org/apache/xalan/tests/xslt3/W3c_xslt30_ForEachGroupTests.java
index 78a6ec9f3..924d1e87c 100644
--- a/src/test/java/org/apache/xalan/tests/xslt3/W3c_xslt30_ForEachGroupTests.java
+++ b/src/test/java/org/apache/xalan/tests/xslt3/W3c_xslt30_ForEachGroupTests.java
@@ -78,5 +78,15 @@ public class W3c_xslt30_ForEachGroupTests extends XslTransformTestsUtil {
runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
}
+
+ @Test
+ public void xslForEachGroupTest4() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test4.xml";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test4.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test4.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
}
diff --git a/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/gold/test4.out b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/gold/test4.out
new file mode 100644
index 000000000..b518dae60
--- /dev/null
+++ b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/gold/test4.out
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+ <group pop="5" country="italy">
+ <city country="italy" name="milan" pop="5"/>
+ </group>
+ <group pop="7" country="france">
+ <city country="france" name="paris" pop="7"/>
+ </group>
+ <group pop="4" country="germany">
+ <city country="germany" name="munich" pop="4"/>
+ </group>
+ <group pop="2" country="france">
+ <city country="france" name="lyon" pop="2"/>
+ </group>
+ <group pop="10" country="england">
+ <city country="england" name="london" pop="10"/>
+ </group>
+ <group pop="5" country="england">
+ <city country="england" name="bristol" pop="5.0"/>
+ <city country="england" name="sheffield" pop="05"/>
+ </group>
+ <group pop="7" country="england">
+ <city country="england" name="manchester" pop="7.0"/>
+ <city country="england" name="liverpool" pop="7"/>
+ </group>
+ <group pop="1" country="italy">
+ <city country="italy" name="venice" pop="1"/>
+ </group>
+</out>
diff --git a/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test3.xsl b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test3.xsl
index d69be4052..76bdd51f1 100644
--- a/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test3.xsl
+++ b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test3.xsl
@@ -21,11 +21,11 @@
<lang>Chinese</lang>
</xsl:variable>
<r>
- <xsl:for-each-group select="reverse($languages/*)" group-ending-with="p">
- <p><xsl:value-of select="position()"/></p>
- <v><xsl:value-of select="."/></v>
- <l><xsl:value-of select="last()"/></l>
- </xsl:for-each-group>
+ <xsl:for-each-group select="reverse($languages/*)" group-ending-with="p">
+ <p><xsl:value-of select="position()"/></p>
+ <v><xsl:value-of select="."/></v>
+ <l><xsl:value-of select="last()"/></l>
+ </xsl:for-each-group>
</r>
</xsl:template>
diff --git a/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xml b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xml
new file mode 100644
index 000000000..bfcb12856
--- /dev/null
+++ b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xml
@@ -0,0 +1,12 @@
+<cities>
+ <city name="milan" country="italy" pop="5"/>
+ <city name="paris" country="france" pop="7"/>
+ <city name="munich" country="germany" pop="4"/>
+ <city name="lyon" country="france" pop="2"/>
+ <city name="london" country="england" pop="10"/>
+ <city name="bristol" country="england" pop="5.0"/>
+ <city name="manchester" country="england" pop="7.0"/>
+ <city name="liverpool" country="england" pop="7"/>
+ <city name="sheffield" country="england" pop="05"/>
+ <city name="venice" country="italy" pop="1"/>
+</cities>
\ No newline at end of file
diff --git a/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xsl b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xsl
new file mode 100644
index 000000000..63ec85bb9
--- /dev/null
+++ b/src/test/resources/w3c_xslt30_testsuite/insn/for_each_group/test4.xsl
@@ -0,0 +1,28 @@
+<?spec xslt#grouping?>
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ exclude-result-prefixes="xs"
+ version="3.0">
+
+ <!-- use with test4.xml -->
+
+ <!-- An XSL test case, to verify fix for W3C XSLT 3.0 xsl:for-each-group
+ test case for-each-group-043.
+ (XSLT 3.0 grouping using group-by with composite keys)
+ -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <out>
+ <xsl:for-each-group select="/*/city"
+ group-by="@country, xs:decimal(@pop)"
+ composite="yes">
+ <group country="{current-grouping-key()[1]}" pop="{current-grouping-key()[2]}">
+ <xsl:copy-of select="current-group()"/>
+ </group>
+ </xsl:for-each-group>
+ </out>
+ </xsl:template>
+
+</xsl:transform>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org