From 3df320b8bd9d213a8027b4a255714d2817917f44 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 11 May 2009 11:37:37 +0000
Subject: [PATCH] Migrate check for Locations that don't start with https://

---
 build/check.xsl      | 17 +++++++++++++++++
 build/statistics.xsl | 23 +----------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/build/check.xsl b/build/check.xsl
index d9de174b..04febd4d 100644
--- a/build/check.xsl
+++ b/build/check.xsl
@@ -105,6 +105,23 @@
 		</xsl:call-template>
 	</xsl:template>
 	
+	
+	<!--
+		Check for Locations that don't start with https://
+		
+		This may be a little strict, and might be better confined to md:* elements.
+		In addition, we might at some point require more complex rules: whitelisting certain
+		entities, or permitting http:// to Locations associated with certain bindngs.
+		
+		At present, however, this simpler rule produces no false positives.
+	-->
+	<xsl:template match="*[@Location and not(starts-with(@Location,'https://'))]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m"><xsl:value-of select='local-name()'/> Location does not start with https://</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
 	<!--
 		Common template to call to report a fatal error on some element within an entity.
 	-->
diff --git a/build/statistics.xsl b/build/statistics.xsl
index 4f15061c..6fdeeac6 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -90,14 +90,6 @@
             at the start so that we can include or exclude the associated section.
         -->
 
-        <!-- Locations that don't start with https:// -->
-        <xsl:variable name="prob.nohttps.location.exceptions"
-            select="$entities[@entityID='no.such.entity']"/>
-        <xsl:variable name="prob.nohttps.location.entities"
-            select="set:difference($entities, $prob.nohttps.location.exceptions)"/>
-        <xsl:variable name="prob.nohttps.location"
-            select="$prob.nohttps.location.entities[descendant::*[@Location and not(starts-with(@Location,'https://'))]]"/>
-        
         <!-- duplicate entity IDs -->
         <xsl:variable name="prob.distinct.entityIDs" select="set:distinct($entities/@entityID)"/>
         <xsl:variable name="prob.dup.entityID"
@@ -115,8 +107,7 @@
         <xsl:variable name="prob.unowned.entities" select="set:difference($entities, $ownedEntities)"/>
 
         <!-- all problems, used as a conditional -->
-        <xsl:variable name="prob.all" select="$prob.nohttps.location |
-            $prob.dup.entityID |
+        <xsl:variable name="prob.all" select="$prob.dup.entityID |
             $prob.dup.ODNs |
             $prob.unowned.entities"/>
         <xsl:variable name="prob.count" select="count($prob.all)"/>
@@ -149,18 +140,6 @@
                 -->                
                 <xsl:if test="$prob.count != 0">
                     <h2><a name="problems">Metadata Problems</a></h2>
-                    <xsl:if test="count($prob.nohttps.location) != 0">
-                        <p>The following entities include elements with <code>Location</code> attributes
-                        that don't start with <code>https://</code>:</p>
-                        <ul>
-                            <xsl:for-each select="$prob.nohttps.location">
-                                <li>
-                                    <xsl:value-of select="@ID"/>:
-                                    <code><xsl:value-of select="@entityID"/></code>
-                                </li>
-                            </xsl:for-each>
-                        </ul>
-                    </xsl:if>
                     <xsl:if test="count($prob.dup.entityID) != 0">
                         <p>The following entity names are used by more than one entity:</p>
                         <ul>