From 380b5493c0803de786681339a6e3cf7a9c3e3ac4 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 21 Apr 2006 20:10:44 +0000
Subject: [PATCH] Move xml:base fiddling to named template: add-xml-base

---
 xsl/common/stripns.xsl | 88 ++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 54 deletions(-)

diff --git a/xsl/common/stripns.xsl b/xsl/common/stripns.xsl
index 0fac76927..a6c1b6c5e 100644
--- a/xsl/common/stripns.xsl
+++ b/xsl/common/stripns.xsl
@@ -20,35 +20,7 @@
 	  </xsl:attribute>
 	</xsl:if>
 
-	<xsl:if test="not(@xml:base) and function-available('saxon:systemId')">
-	  <xsl:variable name="base" select="saxon:systemId()"/>
-	  <xsl:attribute name="xml:base">
-	    <xsl:call-template name="systemIdToBaseURI">
-	      <xsl:with-param name="systemId">
-		<!-- file: seems to confuse some processors. -->
-		<xsl:choose>
-		  <xsl:when test="starts-with($base, 'file:///')">
-		    <xsl:value-of select="substring-after($base,'file://')"/>
-		  </xsl:when>
-		  <xsl:when test="starts-with($base, 'file://')">
-		    <xsl:value-of select="substring-after($base,'file:/')"/>
-		  </xsl:when>
-		  <xsl:when test="starts-with($base, 'file:/')
-				  and substring($base, 8, 1) = ':'">
-		    <!-- Stupid windows file:/c:/path... -->
-		    <xsl:value-of select="substring-after($base,'file:/')"/>
-		  </xsl:when>
-		  <xsl:when test="starts-with($base, 'file:/')">
-		    <xsl:value-of select="substring-after($base,'file:')"/>
-		  </xsl:when>
-		  <xsl:otherwise>
-		    <xsl:value-of select="$base"/>
-		  </xsl:otherwise>
-		</xsl:choose>
-	      </xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:attribute>
-	</xsl:if>
+	<xsl:call-template name="add-xml-base"/>
 
         <xsl:apply-templates mode="stripNS"/>
       </xsl:element>
@@ -63,31 +35,7 @@
 	  </xsl:attribute>
 	</xsl:if>
 
-	<xsl:if test="not(@xml:base) and function-available('saxon:systemId')">
-	  <xsl:attribute name="xml:base">
-	    <xsl:call-template name="systemIdToBaseURI">
-	      <xsl:with-param name="systemId">
-		<xsl:choose>
-		  <!-- file: seems to confuse some processors. -->
-		  <xsl:when test="starts-with(saxon:systemId(), 'file:/')
-				  and substring(saxon:systemId(), 7, 2) != '//'">
-		    <xsl:value-of
-			select="concat('file:///',
-				       substring-after(saxon:systemId(),
-				       'file:/'))"/>
-		  </xsl:when>
-		  <xsl:when test="starts-with(saxon:systemId(), 'file:')">
-		    <xsl:value-of select="substring-after(saxon:systemId(),
-					                  'file:')"/>
-		  </xsl:when>
-		  <xsl:otherwise>
-		    <xsl:value-of select="saxon:systemId()"/>
-		  </xsl:otherwise>
-		</xsl:choose>
-	      </xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:attribute>
-	</xsl:if>
+	<xsl:call-template name="add-xml-base"/>
 
         <xsl:apply-templates mode="stripNS"/>
       </xsl:copy>
@@ -287,6 +235,38 @@
   </xsl:element>
 </xsl:template>
 
+<xsl:template name="add-xml-base">
+  <xsl:if test="not(@xml:base) and function-available('saxon:systemId')">
+    <xsl:variable name="base" select="saxon:systemId()"/>
+    <xsl:attribute name="xml:base">
+      <xsl:call-template name="systemIdToBaseURI">
+	<xsl:with-param name="systemId">
+	  <!-- file: seems to confuse some processors. -->
+	  <xsl:choose>
+	    <xsl:when test="starts-with($base, 'file:///')">
+	      <xsl:value-of select="substring-after($base,'file://')"/>
+	    </xsl:when>
+	    <xsl:when test="starts-with($base, 'file://')">
+	      <xsl:value-of select="substring-after($base,'file:/')"/>
+	    </xsl:when>
+	    <xsl:when test="starts-with($base, 'file:/')
+			    and substring($base, 8, 1) = ':'">
+	      <!-- Stupid windows file:/c:/path... -->
+	      <xsl:value-of select="substring-after($base,'file:/')"/>
+	    </xsl:when>
+	    <xsl:when test="starts-with($base, 'file:/')">
+	      <xsl:value-of select="substring-after($base,'file:')"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:value-of select="$base"/>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
 <xsl:template name="systemIdToBaseURI">
   <xsl:param name="systemId" select="''"/>
   <xsl:if test="contains($systemId,'/')">
-- 
2.40.0