From 39eb798093ae17116d744dd57429632f6608097d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 7 Aug 2008 16:14:52 +0000
Subject: [PATCH] Don't deduce primary scope as being the first scope
 mentioned, have it be explicitly denoted by an attribute.  Take the first
 such scope mentioned for a member, ignore all others.  Stats page displays
 primary scope in fixed pitch font now.  Adjust actual metadata for iay.org.uk
 to suit the above.

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

diff --git a/build/statistics.xsl b/build/statistics.xsl
index 48cbddb0..1286fee0 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -1081,7 +1081,7 @@
         <xsl:param name="entities"/>
         <xsl:variable name="myName" select="string(md:OrganizationName)"/>
         <xsl:variable name="matched" select="$entities[md:Organization/md:OrganizationName = $myName]"/>
-        <xsl:variable name="scopes" select="members:Scopes/members:Scope"/>
+        <xsl:variable name="primaryScope" select="members:Scopes/members:Scope[@isPrimary='true'][position()=1]"/>
         <tr>
             <td><xsl:value-of select="$myName"/></td>
             <!-- count total entities -->
@@ -1130,20 +1130,14 @@
                     </xsl:otherwise>
                 </xsl:choose>
             </td>
-            <!-- Scope or scopes -->
+            <!-- Primary Scope, if present -->
             <td align="left">
                 <xsl:choose>
-                    <xsl:when test="count($scopes) = 0">
+                    <xsl:when test="count($primaryScope) = 0">
                         &#160;
                     </xsl:when>
-                    <xsl:when test="count($scopes) = 1">
-                        <xsl:value-of select="$scopes"/>
-                    </xsl:when>
                     <xsl:otherwise>
-                        <xsl:value-of select="$scopes[position()=1]"/>
-                        <br />
-                        (<xsl:value-of select="count($scopes)-1"/> other
-                        scope<xsl:if test="count($scopes) != 2">s</xsl:if>)
+                        <code><xsl:value-of select="$primaryScope"/></code>
                     </xsl:otherwise>
                 </xsl:choose>
             </td>