From 86b6f9e194d66e3ad3501818088dd13181d25234 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 7 Feb 2020 15:04:06 +0000
Subject: [PATCH] Update statistics page to track Shibboleth 4 now that the IdP
 beta is out

See ukf/ukf-meta#212.
---
 mdx/uk/statistics.xsl | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl
index 525b0ddc..7222b3b6 100644
--- a/mdx/uk/statistics.xsl
+++ b/mdx/uk/statistics.xsl
@@ -1587,9 +1587,20 @@
                 select="set:difference($entities.openathens.in, $entities.openathens)"/>
 
             <!--
-                Classify Shibboleth 3 IdPs entities.
+                Classify Shibboleth 4 entities.
             -->
-            <xsl:variable name="entities.shib.3.in" select="$entities.openathens.out"/>
+            <xsl:variable name="entities.shib.4.in" select="$entities.openathens.out"/>
+            <xsl:variable name="entities.shib.4"
+                select="$entities.shib.4.in[
+                md:Extensions/ukfedlabel:Software[@name='Shibboleth'][@version = '4']
+                ]"/>
+            <xsl:variable name="entities.shib.4.out"
+                select="set:difference($entities.shib.4.in, $entities.shib.4)"/>
+
+            <!--
+                Classify Shibboleth 3 entities.
+            -->
+            <xsl:variable name="entities.shib.3.in" select="$entities.shib.4.out"/>
             <xsl:variable name="entities.shib.3"
                 select="$entities.shib.3.in[
                 md:Extensions/ukfedlabel:Software[@name='Shibboleth'][@version = '3']
@@ -1666,6 +1677,12 @@
                 ***************************************************************
             -->
 
+            <xsl:call-template name="entity.breakdown.by.software.line">
+                <xsl:with-param name="entities" select="$entities.shib.4"/>
+                <xsl:with-param name="name">Shibboleth 4.x</xsl:with-param>
+                <xsl:with-param name="total" select="$entityCount"/>
+            </xsl:call-template>
+
             <xsl:call-template name="entity.breakdown.by.software.line">
                 <xsl:with-param name="entities" select="$entities.shib.3"/>
                 <xsl:with-param name="name">Shibboleth 3.x</xsl:with-param>
@@ -1678,7 +1695,7 @@
                 <xsl:with-param name="total" select="$entityCount"/>
             </xsl:call-template>
 
-            <xsl:variable name="entities.shib" select="$entities.shib.2 | $entities.shib.3"/>
+            <xsl:variable name="entities.shib" select="$entities.shib.2 | $entities.shib.3 | $entities.shib.4"/>
             <xsl:call-template name="entity.breakdown.by.software.line">
                 <xsl:with-param name="entities" select="$entities.shib"/>
                 <xsl:with-param name="name">Shibboleth combined</xsl:with-param>