From 1c2e10d02ec5b445791ead9efa14fa67b716289a Mon Sep 17 00:00:00 2001
From: Arjan Loeffen <arjan.loeffen@armatiek.nl>
Date: Wed, 15 Jun 2022 10:27:14 +0200
Subject: [PATCH] Configuratie items worden gesorteerd.

Dit is cherry picked vanuit Development; noodzakelijk om een
regressietest mogelijk te maken op de configuratie.

Bugfix. Het is een "functionele bug" om niet te sorteren.
---
 .../xsl/ConfigCompiler/Imvert2configuration.xsl | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
index a9ad9455..d507cf1a 100644
--- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
+++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
@@ -27,8 +27,6 @@
     
     xmlns:functx="http://www.functx.com"
     
-    xmlns:dlogger="http://www.armatiek.nl/functions/dlogger-proxy"
-    
     exclude-result-prefixes="#all"
     version="2.0">
     
@@ -257,6 +255,7 @@
                 
                 <scalars>
                     <xsl:for-each-group select="$metamodel//scalars/scalar" group-by="@id">
+                        <xsl:sort select="current-grouping-key()"/>
                         <scalar id="{current-grouping-key()}">
                             <xsl:variable name="scalar-group" select="current-group()"/>
                             <xsl:sequence select="imf:fetch-applicable-name($scalar-group/name)"/>
@@ -274,23 +273,27 @@
                 
                 <naming>
                     <xsl:for-each-group select="$metamodel//naming/*" group-by="local-name()">
+                        <xsl:sort select="current-grouping-key()"/>
                         <xsl:apply-templates select="(current-group())[last()]" mode="#current"/>
                     </xsl:for-each-group>
                 </naming>
                 
                 <features>
                     <xsl:for-each-group select="$metamodel//features/feature" group-by="@name">
+                        <xsl:sort select="current-grouping-key()"/>
                         <xsl:apply-templates select="(current-group())[last()]" mode="#current"/>
                     </xsl:for-each-group>
                 </features>
                 
                 <stereotypes>
                     <xsl:for-each-group select="$metamodel//stereotypes/stereo" group-by="@id">
+                        <xsl:sort select="current-grouping-key()"/>
                         <stereo id="{current-grouping-key()}" primary="{(current-group()/@primary)[last()]}">
                             <xsl:variable name="stereo-group" select="current-group()"/>
                             <xsl:sequence select="imf:fetch-applicable-name($stereo-group/name)"/>
                             <xsl:apply-templates select="($stereo-group/desc[@lang=($language,'#all')])[last()]" mode="#current"/>
                             <xsl:for-each-group select="$stereo-group/construct" group-by=".">
+                                <xsl:sort select="current-grouping-key()"/>
                                 <xsl:variable name="construct-group" select="current-group()"/>
                                 <xsl:apply-templates select="$construct-group[last()]" mode="#current"/>
                             </xsl:for-each-group>
@@ -306,12 +309,15 @@
                 <xsl:variable name="visuals" select="visuals"/>
                 <xsl:sequence select="imf:fetch-applicable-name($visuals/name)"/>
                 <xsl:for-each-group select="$visuals//categories/category" group-by="@id">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>   
                 <xsl:for-each-group select="$visuals//measures/measure" group-by="@id">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>   
                 <xsl:for-each-group select="$visuals//stereos/stereo" group-by="@id">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>   
             </visuals>
@@ -322,6 +328,7 @@
                 
                 <name-value-mapping>
                     <xsl:for-each-group select="$xmlschema-rules//tagged-values/tv" group-by="@id">
+                        <xsl:sort select="current-grouping-key()"/>
                         <tv id="{current-grouping-key()}">
                             <xsl:variable name="tv-group" select="current-group()"/>
                             <xsl:apply-templates select="imf:distinct($tv-group/name[@lang=($language,'#all')])" mode="#current"/>
@@ -332,6 +339,7 @@
                 </name-value-mapping>
           
                 <xsl:for-each-group select="$xmlschema-rules//parameter" group-by="@name">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>
           
@@ -343,6 +351,7 @@
                 <xsl:apply-templates select="imf:distinct($jsonschema-rules/name[@lang=($language,'#all')])" mode="#current"/>
                 
                 <xsl:for-each-group select="$jsonschema-rules//parameter" group-by="@name">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>
                 
@@ -355,6 +364,7 @@
                 
                 <tagged-values>
                     <xsl:for-each-group select="$tagset//tagged-values/tv" group-by="@id">
+                        <xsl:sort select="current-grouping-key()"/>
                         <tv id="{current-grouping-key()}">
                             <xsl:variable name="tv-group" select="current-group()"/>
                             <xsl:apply-templates select="($tv-group/@norm)[last()]" mode="#current"/>
@@ -369,12 +379,14 @@
                             <xsl:apply-templates select="($tv-group/inherit)[last()]" mode="#current"/>
                             <stereotypes>
                                 <xsl:for-each-group select="$tv-group/stereotypes/stereo" group-by=".">
+                                    <xsl:sort select="current-grouping-key()"/>
                                     <xsl:variable name="stereo-group" select="current-group()"/>
                                     <xsl:apply-templates select="$stereo-group[last()]" mode="#current"/>
                                 </xsl:for-each-group>
                             </stereotypes>                                
                             <declared-values> <!-- TODO must also take @lang in to account -->
                                 <xsl:for-each-group select="$tv-group/declared-values[@lang=($language,'#all')]/value" group-by=".">
+                                    <xsl:sort select="current-grouping-key()"/>
                                     <xsl:variable name="dec-group" select="current-group()"/>
                                     <xsl:apply-templates select="$dec-group[last()]" mode="#current"/>
                                 </xsl:for-each-group>
@@ -417,6 +429,7 @@
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>
                 <xsl:for-each-group select="$doc-rules//image-purpose[name/@lang=($language,'#all')]" group-by="@id">
+                    <xsl:sort select="current-grouping-key()"/>
                     <xsl:apply-templates select="current-group()[last()]" mode="#current"/>
                 </xsl:for-each-group>
             </doc-rules>