Ignore:
Timestamp:
2009-08-05T16:14:28+12:00 (14 years ago)
Author:
kjdon
Message:

explicitly write out the xsl:stylesheet element with its namespaces as they don't seem to come through with new xalan.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/web/ui/xslt/preProcess.xsl

    r20150 r20157  
    1313
    1414  <xsl:output method="xml"/>
     15  <xsl:namespace-alias
     16    stylesheet-prefix="xslt" result-prefix="xsl"/>
    1517
    1618  <xsl:template match="/">
    1719
    18     <xsl:for-each select="/skinAndLibraryXsl/skinXsl/xsl:stylesheet">
     20    <!-- explicitly output the stylesheet element here so we can include the
     21    namespace declarations. They were going missing before with the new xalan/xerces-->
     22    <xslt:stylesheet version="1.0"
     23      xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
     24      xmlns:gslib="http://www.greenstone.org/skinning"
     25      xmlns:java="http://xml.apache.org/xslt/java"
     26      xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
     27      xmlns:xalan="http://xml.apache.org/xalan"
     28      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     29      xmlns:xslt="output.xsl"
     30      xmlns:gs3="http://www.greenstone.org/gs3">
    1931     
    20       <!-- produce an exact copy of skin stylesheet, with gslib nodes expanded. -->
    21       <xsl:variable name="element-name" select="name()"/>
    22       <xsl:element name="{$element-name}">
     32      <xsl:for-each select="/skinAndLibraryXsl/skinXsl/xsl:stylesheet">
     33   
     34    <!-- produce an exact copy of skin stylesheet, with gslib nodes expanded. -->
    2335    <xsl:for-each select="@*">
    2436      <xsl:variable name="attribute-name" select="name()"/>
    … …  
    2739      </xsl:attribute>
    2840    </xsl:for-each>
    29    
    3041    <!-- merge the attributes of the library stylesheet -->
    3142    <xsl:for-each select="/skinAndLibraryXsl/libraryXsl/xsl:stylesheet/@*">
    … …  
    4354    </xsl:for-each>
    4455   
    45 
    46       </xsl:element>
    47      
    48      
    49     </xsl:for-each>
     56      </xsl:for-each>
     57    </xslt:stylesheet>
     58   
     59   
    5060  </xsl:template>
    5161
Note: See TracChangeset for help on using the changeset viewer.