Don't double-count 2.0 SPs as being 1.3 as well.

InCommon · Mar 25, 2008 · d87e7ac · d87e7ac
1 parent 051a8d8
commit d87e7ac
Showing 1 changed file with 11 additions and 3 deletions.
diff --git 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>