From d87e7acdeb40c0b1b5ac50a9dfe3976f56a3330a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 25 Mar 2008 18:42:17 +0000
Subject: [PATCH] Don't double-count 2.0 SPs as being 1.3 as well.

---
 build/statistics.xsl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/statistics.xsl b/build/statistics.xsl
index c99c9171..d06bdc93 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -594,7 +594,15 @@
                         </li>
                     </xsl:for-each>
                 </ul>
-                
+                
+                <!--
+                    Detect Shibboleth 1.3 entities.
+                    
+                    Pick from things we know aren't Shibboleth 2.0 to avoid
+                    double counting.
+                -->
+                <xsl:variable name="entities.shib.13.in" select="$entities.shib.2.out"/>
+
                 <!--
                     This is a list of identity providers that we *know* are running 1.3, even though they
                     may not look like it.
@@ -625,10 +633,10 @@
                 
                 <xsl:variable name="sps13"
                     select="$known13sps |
-                        $sps/descendant::md:AssertionConsumerService[contains(@Location, 'Shibboleth.sso')]/ancestor::md:EntityDescriptor"/>
+                    $entities.shib.13.in/descendant::md:AssertionConsumerService[contains(@Location, 'Shibboleth.sso')]/ancestor::md:EntityDescriptor"/>
                 <xsl:variable name="idps13"
                     select="$known13idps |
-                        $idps/descendant::md:SingleSignOnService[contains(@Location, '-idp/SSO')]/ancestor::md:EntityDescriptor"/>
+                    $entities.shib.13.in/descendant::md:SingleSignOnService[contains(@Location, '-idp/SSO')]/ancestor::md:EntityDescriptor"/>
                 <xsl:variable name="entities13" select="$sps13 | $idps13"/>
                 <xsl:variable name="entities13Count" select="count($entities13)"/>
                 <h3>Shibboleth 1.3</h3>