From: Jirka Kosek <jirka@kosek.cz>
Date: Mon, 6 Mar 2006 07:47:42 +0000 (+0000)
Subject: Profiling now works together with namespace stripping (V5 documents). Namespace strip... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2db725c5818a30125809daf179ee486c36417c34;p=docbook-dsssl

Profiling now works together with namespace stripping (V5 documents). Namespace striping should work with all stylesheets named profile-, even if they are not supporting namespace stripping in a non-profiling variant.
---

diff --git a/xsl/profiling/profile-mode.xsl b/xsl/profiling/profile-mode.xsl
index 25afa0631..9ee4de78b 100644
--- a/xsl/profiling/profile-mode.xsl
+++ b/xsl/profiling/profile-mode.xsl
@@ -154,7 +154,7 @@
     <xsl:copy>
       <xsl:copy-of select="@*"/>
       <!-- Fix base URI of some elements -->
-      <xsl:if test="$profile.baseuri.fixup and (self::textdata or self::imagedata or self::videodata or self::audiodata or self::inlinegraphic or self::graphic)">
+      <xsl:if test="$profile.baseuri.fixup and (self::textdata or self::imagedata or self::videodata or self::audiodata or self::inlinegraphic or self::graphic) and not(@xml:base)">
 	<xsl:choose>
 	  <xsl:when test="@fileref
 			  and not(contains(@fileref,':'))
diff --git a/xsl/profiling/xsl2profile.xsl b/xsl/profiling/xsl2profile.xsl
index cfd81f763..2341713c6 100644
--- a/xsl/profiling/xsl2profile.xsl
+++ b/xsl/profiling/xsl2profile.xsl
@@ -62,7 +62,19 @@
 <xsl:template match="xsl:template[@match='/']">
   <xslo:include href="../profiling/profile-mode.xsl"/>
   <xslo:variable name="profiled-content">
-    <xslo:apply-templates select="/" mode="profile"/>
+    <xslo:choose>
+      <xslo:when test="*/self::ng:* or */self::db:*">
+	<xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message>
+	<xslo:variable name="stripped-content">
+	  <xslo:apply-templates select="/" mode="stripNS"/>
+	</xslo:variable>
+	<xslo:message>Processing stripped document.</xslo:message>
+	<xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/>
+      </xslo:when>
+      <xslo:otherwise>
+	<xslo:apply-templates select="/" mode="profile"/>
+      </xslo:otherwise>
+    </xslo:choose>
   </xslo:variable>
   <xslo:variable name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
   <xsl:copy>
@@ -128,6 +140,13 @@
   </xsl:copy>
 </xsl:template>
 
+<!-- DB5 namespace stripping is already done  -->
+<xsl:template match="xsl:when[contains(@test, 'self::db')]" mode="correct">
+  <xsl:copy>
+    <xsl:attribute name="test">false()</xsl:attribute>
+  </xsl:copy>
+</xsl:template>
+
 <xsl:template match="*" mode="correct">
   <xsl:copy>
     <xsl:copy-of select="@*"/>