From f6745bded8d23e298c5b3e76d0368c6aabfd908e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 28 Jan 2015 16:59:48 +0000
Subject: [PATCH] Classify and report Shibboleth 3.x entities.

---
 mdx/uk/statistics.xsl | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl
index a5909989..2caa9d1c 100644
--- a/mdx/uk/statistics.xsl
+++ b/mdx/uk/statistics.xsl
@@ -1734,10 +1734,21 @@
             <xsl:variable name="entities.openathens.out"
                 select="set:difference($entities.openathens.in, $entities.openathens)"/>
             
+            <!--
+                Classify Shibboleth 3 IdPs entities.
+            -->
+            <xsl:variable name="entities.shib.3.in" select="$entities.openathens.out"/>
+            <xsl:variable name="entities.shib.3"
+                select="$entities.shib.3.in[
+                md:Extensions/ukfedlabel:Software[@name='Shibboleth'][@version = '3']
+                ]"/>
+            <xsl:variable name="entities.shib.3.out"
+                select="set:difference($entities.shib.3.in, $entities.shib.3)"/>
+            
             <!--
                 Classify Shibboleth 2.0 IdPs and SPs.
             -->
-            <xsl:variable name="entities.shib.2.in" select="$entities.openathens.out"/>
+            <xsl:variable name="entities.shib.2.in" select="$entities.shib.3.out"/>
             <xsl:variable name="entities.shib.2"
                 select="$entities.shib.2.in[
                     md:IDPSSODescriptor/md:SingleSignOnService[contains(@Location, '/profile/Shibboleth/SSO')] |
@@ -1816,19 +1827,25 @@
             -->
             
             <xsl:call-template name="entity.breakdown.by.software.line">
-                <xsl:with-param name="entities" select="$entities.shib.13"/>
-                <xsl:with-param name="name">Shibboleth 1.3</xsl:with-param>
+                <xsl:with-param name="entities" select="$entities.shib.3"/>
+                <xsl:with-param name="name">Shibboleth 3.x</xsl:with-param>
                 <xsl:with-param name="total" select="$entityCount"/>
-                <xsl:with-param name="show.max" select="10"/>
             </xsl:call-template>
-
+            
             <xsl:call-template name="entity.breakdown.by.software.line">
                 <xsl:with-param name="entities" select="$entities.shib.2"/>
                 <xsl:with-param name="name">Shibboleth 2.x</xsl:with-param>
                 <xsl:with-param name="total" select="$entityCount"/>
             </xsl:call-template>
             
-            <xsl:variable name="entities.shib" select="$entities.shib.13 | $entities.shib.2"/>
+            <xsl:call-template name="entity.breakdown.by.software.line">
+                <xsl:with-param name="entities" select="$entities.shib.13"/>
+                <xsl:with-param name="name">Shibboleth 1.3</xsl:with-param>
+                <xsl:with-param name="total" select="$entityCount"/>
+                <xsl:with-param name="show.max" select="10"/>
+            </xsl:call-template>
+
+            <xsl:variable name="entities.shib" select="$entities.shib.13 | $entities.shib.2 | $entities.shib.3"/>
             <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>