Refined namespaced stylesheets to use common logging template to

log messages emitted during namespace stripping.

diff --git a/releasetools/db5files/db5.xsl b/releasetools/db5files/db5.xsl
index bb025f4d1948b8b3c57dab1aeaadefd4bf0e7b76..aee3795bd8d4e12ce6e28ee669705f9c6600bcf4 100644 (file)
--- a/releasetools/db5files/db5.xsl
+++ b/releasetools/db5files/db5.xsl
@@ -9,6 +9,8 @@
                 exclude-result-prefixes="d exsl saxon NodeInfo"
                 version='1.0'>
 
+<xsl:import href="../common/common.xsl"/>
+
 <!-- Template to add the namespace to non-db5 documents -->
 <xsl:template match="*" mode="addNS">
   <xsl:element name="{local-name()}" 
@@ -19,6 +21,11 @@
 </xsl:template>
 
 <xsl:template name="add-xml-base">
+  <!-- * Get a title for current doc so that we let the user -->
+  <!-- * know what document we are processing at this point. -->
+  <xsl:variable name="doc.title">
+    <xsl:call-template name="get.doc.title"/>
+  </xsl:variable>
   <xsl:if test="not(@xml:base)">
     <xsl:variable name="base">
       <xsl:choose>
@@ -29,11 +36,26 @@
           <xsl:value-of select="NodeInfo:systemId()"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>WARNING: cannot add @xml:base to node </xsl:text>
-            <xsl:text>set root element.  </xsl:text>
-            <xsl:text>Relative paths may not work.</xsl:text>
-          </xsl:message>
+          <xsl:call-template name="log.message">
+            <xsl:with-param name="level">Warn</xsl:with-param>
+            <xsl:with-param name="source" select="$doc.title"/>
+            <xsl:with-param name="context-desc">
+              <xsl:text>no @xml:base</xsl:text>
+            </xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>cannot add @xml:base to node-set root element</xsl:text>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:call-template name="log.message">
+            <xsl:with-param name="level">Warn</xsl:with-param>
+            <xsl:with-param name="source" select="$doc.title"/>
+            <xsl:with-param name="context-desc">
+              <xsl:text>no @xml:base</xsl:text>
+            </xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>relative paths may not work</xsl:text>
+            </xsl:with-param>
+          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>

diff --git a/releasetools/makedb5xsl b/releasetools/makedb5xsl
index f5154dfdaa4fc4db58403f703c2a1a6af05dcd95..da82a8dbe5151354a5a7542c88dd38ca170f7b58 100755 (executable)
--- a/releasetools/makedb5xsl
+++ b/releasetools/makedb5xsl
@@ -255,7 +255,7 @@ sub nsfilter {
   # Convert stripNS to addNS
   s|href="../common/stripns.xsl"|href="../common/db5.xsl"|sg;
   
-  s|(\s*\n*)(\s*)(<xslo?:when)\s+test\s*=\s*"[^"]*?self::db:[^"]*?">.*?(</xslo?:when>)|$1$2$3 test="namespace-uri\(\*\[1\]\) != 'http://docbook.org/ns/docbook'">\n$2  <xsl:message>Adding DocBook namespace to version 4 DocBook document</xsl:message>\n$2  <xsl:variable name="addns">\n$2    <xsl:apply-templates mode="addNS"/>\n$2  </xsl:variable>\n$2  <xsl:apply-templates select="exsl:node-set\(\$addns\)"/>\n$2$4|sg;
+  s|(\s*\n*)(\s*)(<xslo?:when)\s+test\s*=\s*"[^"]*?self::db:[^"]*?">.*?(</xslo?:when>)|$1$2$3 test="namespace-uri\(\*\[1\]\) != 'http://docbook.org/ns/docbook'">\n$2 <xsl:variable name="doc.title">\n$2 <xsl:call-template name="get.doc.title"/>\n$2 </xsl:variable>\n$2 <xsl:call-template name="log.message">\n$2 <xsl:with-param name="level">Note</xsl:with-param>\n$2 <xsl:with-param name="source" select="\$doc.title"/>\n$2 <xsl:with-param name="context-desc">\n$2 <xsl:text>namesp. add</xsl:text>\n$2 </xsl:with-param>\n$2 <xsl:with-param name="message">\n$2 <xsl:text>added namespace before processing</xsl:text>\n$2 </xsl:with-param>\n$2 </xsl:call-template>\n$2 <xsl:variable name="addns">\n$2    <xsl:apply-templates mode="addNS"/>\n$2  </xsl:variable>\n$2  <xsl:apply-templates select="exsl:node-set\(\$addns\)"/>\n$2$4|sg;
   
   # Add namespace d to exclude-result-prefixes