From 3090dfce2f9fa92fc498f5b7fa5afb71324fe353 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 1 Jul 2008 17:01:09 +0000
Subject: [PATCH] Allow entities with Software labels with arbitrary names to
 be pulled aside early in the classification process and then re-integrated at
 the end with those which fail classification.  Display the software name for
 such entities in the reporting section.

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

diff --git a/build/statistics.xsl b/build/statistics.xsl
index fe3b1f1d..fcf86c20 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -548,10 +548,30 @@
                     specific algorithms should appear before more general ones.
                 -->
                 
+                <!--
+                    Classify miscellaneous entities.
+                    
+                    Here we pull off a list of entities labelled with explicit
+                    Software labels that aren't for the software we address
+                    in more detail below.  The result is, as it were, a list of
+                    "known unknowns" that we can re-integrate later with those
+                    entities we fail to classify altogether.
+                -->
+                <xsl:variable name="entities.misc.in" select="$entities"/>
+                <xsl:variable name="entities.misc"
+                    select="$entities.misc.in[
+                        md:Extensions/uklabel:Software
+                            [@name != 'Shibboleth']
+                            [@name != 'EZproxy']
+                            [@name != 'OpenAthens SP']
+                    ]"/>
+                <xsl:variable name="entities.misc.out"
+                    select="set:difference($entities.misc.in, $entities.misc)"/>
+                
                 <!--
                     Classify EZproxy SPs
                 -->
-                <xsl:variable name="entities.ezproxy.in" select="$entities"/>
+                <xsl:variable name="entities.ezproxy.in" select="$entities.misc.out"/>
                 <xsl:variable name="entities.ezproxy"
                     select="$entities.ezproxy.in[md:Extensions/uklabel:Software/@name='EZproxy']"/>
                 <xsl:variable name="entities.ezproxy.out"
@@ -695,7 +715,8 @@
                 -->                
                 <xsl:variable name="knownSoftwareEntities"
                     select="$entities.classified | $athensImEntities | $knownGuanxiIdps"/>
-                <xsl:variable name="unknownSoftwareEntities" select="set:difference($entities, $knownSoftwareEntities)"/>
+                <xsl:variable name="unknownSoftwareEntities"
+                    select="set:difference($entities, $knownSoftwareEntities) | $entities.misc"/>
                 <xsl:variable name="unknownSoftwareEntityCount" select="count($unknownSoftwareEntities)"/>
                 
                 <!--
@@ -1005,7 +1026,7 @@
                 <!--
                     Unknown entities.
                 -->
-                <h3>Unknown Software</h3>
+                <h3>Unknown or Other Software</h3>
                 <p>
                     There are <xsl:value-of select="$unknownSoftwareEntityCount"/> entities in the metadata that
                     don't fall into any of the categories above.
@@ -1024,6 +1045,9 @@
                                 <xsl:when test="@entityID = 'https://www.educationcity.com/sso/shib'">
                                     (proprietary implementation)
                                 </xsl:when>
+                                <xsl:when test="md:Extensions/uklabel:Software">
+                                    (<xsl:value-of select="md:Extensions/uklabel:Software/@name"/>)
+                                </xsl:when>
                             </xsl:choose>
                         </li>
                     </xsl:for-each>