From 33aff17ecfb1e2e918b2ff01c9e9c49ba1224156 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 11 Sep 2009 17:32:01 +0000
Subject: [PATCH] Reverse the filtering for uklabel namespace elements. 
 Instead of excluding only uklabel:Software, exclude everything *except* a
 list of specific elements.  This means that we can deploy new elements
 internally and have them hidden from publication by default.

---
 build/uk_master_back.xsl     | 15 +++++++++++++--
 build/uk_master_export.xsl   | 15 +++++++++++++--
 build/uk_master_test.xsl     | 15 +++++++++++++--
 build/uk_master_unsigned.xsl | 15 +++++++++++++--
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
index a7f2a476..b550c08f 100644
--- a/build/uk_master_back.xsl
+++ b/build/uk_master_back.xsl
@@ -65,9 +65,20 @@
 	</xsl:template>
 	
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index 330658df..ce9d38e5 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -45,9 +45,20 @@
 	</xsl:template>
 	
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index d7972bdd..091dc3c2 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -86,9 +86,20 @@
 	</xsl:template>
 	
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 9408054f..365099aa 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -81,9 +81,20 @@
 	</xsl:template>
 	
 	<!--
-		Strip uklabel:Software elements entirely.
+		Pass through certain uklabel namespace elements.
 	-->
-	<xsl:template match="uklabel:Software|uklabel:Software">
+	<xsl:template match="uklabel:UKFederationMember |
+		uklabel:SDSSPolicy |
+		uklabel:AccountableUsers">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--
+		Strip all other uklabel namespace elements entirely.
+	-->
+	<xsl:template match="uklabel:*">
 		<!-- do nothing -->
 	</xsl:template>