Modified: forrest/trunk/main/webapp/resources/stylesheets/profile-to-html.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/profile-to-html.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/profile-to-html.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/profile-to-html.xsl Mon Apr 9 19:07:17 2007 @@ -15,16 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:profile="http://apache.org/cocoon/profiler/1.0";> - <xsl:param name="sort"/> <xsl:param name="key"/> <xsl:param name="result"/> <xsl:param name="component"/> - <xsl:template match="/"> <html> <head> @@ -47,7 +44,6 @@ </body> </html> </xsl:template> - <xsl:template match="profile:profilerinfo" mode="pipelines"> <p> Sort results by <a href="?sort=uri">uri</a>, @@ -55,11 +51,10 @@ </p> <p> Start at the section which matches the original request, then follow the - processing. The right-hand columns are the times (in milliseconds) for - each occasion that a component was processed. The far right column is - the initial occasion. + processing. The right-hand columns are the times (in milliseconds) for + each occasion that a component was processed. The far right column is the + initial occasion. </p> - <table noshade="noshade" border="0" cellspacing="1" cellpadding="0"> <xsl:choose> <xsl:when test="$sort = 'uri'"> @@ -83,90 +78,82 @@ </xsl:choose> </table> </xsl:template> - <xsl:template match="profile:pipeline"> <xsl:if test="position() mod 5 = 1"> <tr bgcolor="#FFC0C0"> - <th></th> - <th>Component</th> - <th>Average</th> - <th colspan="10">Last Results</th> + <th></th> + <th>Component</th> + <th>Average</th> + <th colspan="10">Last Results</th> </tr> </xsl:if> <tr bgcolor="#C0C0FF"> - <td colspan="3"> - <font face="verdana"><strong><xsl:value-of select="@uri"/></strong></font> + <td colspan="3"> + <font face="verdana"><strong> + <xsl:value-of select="@uri"/></strong> + </font> (<xsl:value-of select="@count"/> results, total time: <xsl:value-of select="@processingTime"/>, average time: <xsl:value-of select="profile:average/@time"/>) </td> - <xsl:for-each select="profile:result"> - <td> - <a href="?key={../@key}&[EMAIL PROTECTED]"> - <xsl:value-of select="@index"/> - </a> - </td> - </xsl:for-each> + <xsl:for-each select="profile:result"> + <td><a href="?key={../@key}&[EMAIL PROTECTED]"> + <xsl:value-of select="@index"/></a> + </td> + </xsl:for-each> </tr> - <xsl:for-each select="profile:average/profile:component"> <xsl:variable name="bgcolor"> - <xsl:if test="position() mod 2 = 0">#D0D0D0</xsl:if> - <xsl:if test="position() mod 2 = 1">#E0E0E0</xsl:if> + <xsl:if test="position() mod 2 = 0">#D0D0D0</xsl:if> + <xsl:if test="position() mod 2 = 1">#E0E0E0</xsl:if> </xsl:variable> <tr bgcolor="{$bgcolor}"> - - <xsl:variable name="pos" select="position()"/> - <td> - <xsl:value-of select="$pos"/> - </td> - <td> - <xsl:value-of select="@role"/> - <xsl:text> </xsl:text> - <xsl:if test="@source"> - <i>src=</i><xsl:value-of select="@source"/> - </xsl:if> - </td> - - <xsl:for-each select="../../profile:average/profile:component[position()=$pos]"> - <th> - <xsl:value-of select="@time"/> - </th> - </xsl:for-each> - - <xsl:for-each select="../../profile:result/profile:component[position()=$pos]"> + <xsl:variable name="pos" select="position()"/> <td> - <xsl:value-of select="@time"/> + <xsl:value-of select="$pos"/> + </td> + <td> + <xsl:value-of select="@role"/> +<xsl:text> </xsl:text> + <xsl:if test="@source"> + <i>src=</i> + <xsl:value-of select="@source"/> + </xsl:if> </td> - </xsl:for-each> - + <xsl:for-each select="../../profile:average/profile:component[position()=$pos]"> + <th> + <xsl:value-of select="@time"/> + </th> + </xsl:for-each> + <xsl:for-each select="../../profile:result/profile:component[position()=$pos]"> + <td> + <xsl:value-of select="@time"/> + </td> + </xsl:for-each> </tr> </xsl:for-each> - - <xsl:variable name="pos" select="count(profile:average/profile:component)"/> - <tr> - <td> + <xsl:variable name="pos" select="count(profile:average/profile:component)"/> + <tr> + <td> <xsl:value-of select="$pos+1"/> - </td> - <td> + </td> + <td> TOTAL </td> - - <th> - <xsl:value-of select="profile:average/@time"/> - </th> - - <xsl:for-each select="profile:result"> + <th> + <xsl:value-of select="profile:average/@time"/> + </th> + <xsl:for-each select="profile:result"> <td> - <xsl:value-of select="@time"/> + <xsl:value-of select="@time"/> </td> - </xsl:for-each> - - </tr> + </xsl:for-each> + </tr> </xsl:template> - <xsl:template match="profile:result" mode="result"> - <h1><xsl:value-of select="profile:environmentinfo/profile:uri"/></h1> + <h1> + <xsl:value-of select="profile:environmentinfo/profile:uri"/> + </h1> <table> <tr bgcolor="#FFC0C0"> <th></th> @@ -175,49 +162,45 @@ </tr> <tr bgcolor="#C0C0FF"> <td colspan="2"> - <font face="verdana"><strong><xsl:value-of select="profile:environmentinfo/profile:uri"/></strong></font> + <font face="verdana"><strong> + <xsl:value-of select="profile:environmentinfo/profile:uri"/></strong> + </font> </td> <td>Total Time</td> <td>Setup Time</td> <td>Processing Time</td> <td/> </tr> - <xsl:for-each select="profile:component"> <xsl:variable name="bgcolor"> <xsl:if test="position() mod 2 = 0">#D0D0D0</xsl:if> <xsl:if test="position() mod 2 = 1">#E0E0E0</xsl:if> </xsl:variable> <tr bgcolor="{$bgcolor}"> - <xsl:variable name="pos" select="position()"/> <td> <xsl:value-of select="$pos"/> </td> <td> <xsl:value-of select="@role"/> - <xsl:text> </xsl:text> +<xsl:text> </xsl:text> <xsl:if test="@source"> - <i>src=</i><xsl:value-of select="@source"/> + <i>src=</i> + <xsl:value-of select="@source"/> </xsl:if> </td> - <td> <xsl:value-of select="@time"/> </td> - <td> <xsl:value-of select="@setup"/> </td> - <td> <xsl:value-of select="@processing"/> </td> - <td> <xsl:if test="position() != last()"> - <!-- FIXME: hard-coded filename --> - <a href="cprofile.xml?key={$key}&result={$result}&[EMAIL PROTECTED]&fragmentonly=true">[XML]</a> +<!-- FIXME: hard-coded filename --><a href="cprofile.xml?key={$key}&result={$result}&[EMAIL PROTECTED]&fragmentonly=true">[XML]</a> <!-- Forrest doesn't enable this cocoon-view    <a href="profile.xml?key={$key}&result={$result}&[EMAIL PROTECTED]&fragmentonly=true&cocoon-view=pretty-content">[XML as HTML]</a> @@ -229,16 +212,14 @@ </table> <xsl:apply-templates select="profile:environmentinfo"/> </xsl:template> - <xsl:template match="profile:environmentinfo"> - <xsl:apply-templates select="profile:request-parameters"/> - <xsl:apply-templates select="profile:session-attributes"/> + <xsl:apply-templates select="profile:request-parameters"/> + <xsl:apply-templates select="profile:session-attributes"/> </xsl:template> - <xsl:template match="profile:request-parameters"> <table> <tr bgcolor="#C0C0FF"> - <th colspan="2"> + <th colspan="2"> Request parameters </th> </tr> @@ -251,19 +232,21 @@ <xsl:if test="position() mod 2 = 0">#D0D0D0</xsl:if> <xsl:if test="position() mod 2 = 1">#E0E0E0</xsl:if> </xsl:variable> - <tr bgcolor="{$bgcolor}"> - <td><xsl:value-of select="@name"/></td> - <td><xsl:value-of select="@value"/></td> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@value"/> + </td> </tr> </xsl:for-each> </table> </xsl:template> - <xsl:template match="profile:session-attributes"> <table> <tr bgcolor="#C0C0FF"> - <th colspan="2"> + <th colspan="2"> Session attributes </th> </tr> @@ -276,13 +259,15 @@ <xsl:if test="position() mod 2 = 0">#D0D0D0</xsl:if> <xsl:if test="position() mod 2 = 1">#E0E0E0</xsl:if> </xsl:variable> - <tr bgcolor="{$bgcolor}"> - <td><xsl:value-of select="@name"/></td> - <td><xsl:value-of select="@value"/></td> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@value"/> + </td> </tr> </xsl:for-each> </table> </xsl:template> - </xsl:stylesheet>
Modified: forrest/trunk/main/webapp/resources/stylesheets/profile-to-page.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/profile-to-page.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/profile-to-page.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/profile-to-page.xsl Mon Apr 9 19:07:17 2007 @@ -18,281 +18,260 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:profile="http://apache.org/cocoon/profiler/1.0";> - - <xsl:param name="key"/> - <xsl:param name="result"/> - <xsl:param name="component"/> - - <xsl:template match="/"> - <document> - <header> - <title>Forrest Profiler</title> - <tab title="Back" href="index.html"/> - </header> - <body> - <xsl:choose> - <xsl:when test="$component!=''"> - <xsl:apply-templates + <xsl:param name="key"/> + <xsl:param name="result"/> + <xsl:param name="component"/> + <xsl:template match="/"> + <document> + <header> + <title>Forrest Profiler</title> + <tab title="Back" href="index.html"/> + </header> + <body> + <xsl:choose> + <xsl:when test="$component!=''"> + <xsl:apply-templates select="profile:profilerinfo/profile:pipeline/profile:result/profile:[EMAIL PROTECTED]" mode="fragment"/> - </xsl:when> - <xsl:when test="$result!=''"> - <xsl:apply-templates select="profile:profilerinfo/profile:pipeline/profile:result" mode="result"/> - </xsl:when> - <xsl:when test="$key!=''"> - <xsl:apply-templates select="profile:profilerinfo/profile:pipeline" mode="results"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="profile:profilerinfo" mode="pipelines"/> - </xsl:otherwise> - </xsl:choose> - - </body> - </document> - </xsl:template> - - <xsl:template match="profile:profilerinfo" mode="pipelines"> - - <row> - <column title="Overview"> - - <table width="100%" cellspacing="0" cellpadding="5" align="left"> - <font size="+0" face="arial,helvetica,sanserif" color="#000000"> - - <tr> - <td align="left"><b>URI</b></td> - <td align="left"><b>Average(Total time)</b></td> - <td align="left" colspan="10"><b>Last Results(Total time)</b></td> - </tr> - - <xsl:for-each select="profile:pipeline"> - - <tr bgcolor="#FFFFFF"> - <td> - <a href="[EMAIL PROTECTED]"> - <font face="verdana"><strong><xsl:value-of select="@uri"/></strong></font> + </xsl:when> + <xsl:when test="$result!=''"> + <xsl:apply-templates select="profile:profilerinfo/profile:pipeline/profile:result" mode="result"/> + </xsl:when> + <xsl:when test="$key!=''"> + <xsl:apply-templates select="profile:profilerinfo/profile:pipeline" mode="results"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="profile:profilerinfo" mode="pipelines"/> + </xsl:otherwise> + </xsl:choose> + </body> + </document> + </xsl:template> + <xsl:template match="profile:profilerinfo" mode="pipelines"> + <row> + <column title="Overview"> + <table width="100%" cellspacing="0" cellpadding="5" align="left"> + <font size="+0" face="arial,helvetica,sanserif" color="#000000"> + <tr> + <td align="left"> + <b>URI</b> + </td> + <td align="left"> + <b>Average(Total time)</b> + </td> + <td align="left" colspan="10"> + <b>Last Results(Total time)</b> + </td> + </tr> + <xsl:for-each select="profile:pipeline"> + <tr bgcolor="#FFFFFF"> + <td><a href="[EMAIL PROTECTED]"> + <font face="verdana"><strong> + <xsl:value-of select="@uri"/></strong> + </font></a> + </td> + <td><a href="[EMAIL PROTECTED]"> + <xsl:value-of select="profile:average/@time"/> ms </a> - </td> - <td> - <a href="[EMAIL PROTECTED]"> - <xsl:value-of select="profile:average/@time"/> ms - </a> - </td> - <xsl:for-each select="profile:result"> - <td> - <a href="?key={../@key}&[EMAIL PROTECTED]"> - <xsl:value-of select="@time"/> ms + </td> + <xsl:for-each select="profile:result"> + <td><a href="?key={../@key}&[EMAIL PROTECTED]"> + <xsl:value-of select="@time"/> ms </a> - </td> - </xsl:for-each> - </tr> - - </xsl:for-each> - - </font> - </table> - - </column> - </row> - - </xsl:template> - - <xsl:template match="profile:pipeline" mode="results"> - - <row> - <column title="[EMAIL PROTECTED]"> - - <table width="100%" cellspacing="0" cellpadding="5" align="left"> - <font size="+0" face="arial,helvetica,sanserif" color="#000000"> - - <tr> - <td align="left"><b>NN</b></td> - <td align="left"><b>Components(Role)</b></td> - <td align="left"><b>Average time</b></td> - <td align="left"><b>Lastest times</b></td> - </tr> - - <xsl:for-each select="profile:average/profile:component"> - <tr> - - <xsl:variable name="pos" select="position()"/> - <td width="1%"> - <xsl:value-of select="$pos"/> - </td> - <td width="10%"> - <xsl:value-of select="@role"/> - <xsl:if test="@source"> + </td> + </xsl:for-each> + </tr> + </xsl:for-each> + </font> + </table> + </column> + </row> + </xsl:template> + <xsl:template match="profile:pipeline" mode="results"> + <row> + <column title="[EMAIL PROTECTED]"> + <table width="100%" cellspacing="0" cellpadding="5" align="left"> + <font size="+0" face="arial,helvetica,sanserif" color="#000000"> + <tr> + <td align="left"> + <b>NN</b> + </td> + <td align="left"> + <b>Components(Role)</b> + </td> + <td align="left"> + <b>Average time</b> + </td> + <td align="left"> + <b>Lastest times</b> + </td> + </tr> + <xsl:for-each select="profile:average/profile:component"> + <tr> + <xsl:variable name="pos" select="position()"/> + <td width="1%"> + <xsl:value-of select="$pos"/> + </td> + <td width="10%"> + <xsl:value-of select="@role"/> + <xsl:if test="@source"> (<xsl:value-of select="@source"/>) </xsl:if> - </td> - - <xsl:for-each select="../../profile:average/profile:component[position()=$pos]"> - <td> - <xsl:value-of select="@time"/> ms + </td> + <xsl:for-each select="../../profile:average/profile:component[position()=$pos]"> + <td> + <xsl:value-of select="@time"/> ms </td> - </xsl:for-each> - - <xsl:for-each select="../../profile:result/profile:component[position()=$pos]"> - <td> - <a href="?key={../../@key}&result={../@index}&[EMAIL PROTECTED]"> - <xsl:value-of select="@time"/> ms + </xsl:for-each> + <xsl:for-each select="../../profile:result/profile:component[position()=$pos]"> + <td><a href="?key={../../@key}&result={../@index}&[EMAIL PROTECTED]"> + <xsl:value-of select="@time"/> ms </a> - </td> - </xsl:for-each> - - </tr> - </xsl:for-each> - - <tr> - <td></td> - <td><b>Total time</b></td> - <td><b><xsl:value-of select="profile:result/@time"/> ms</b></td> - <xsl:for-each select="profile:result"> - <td> - <b> - <xsl:value-of select="@time"/> ms + </td> + </xsl:for-each> + </tr> + </xsl:for-each> + <tr> + <td></td> + <td> + <b>Total time</b> + </td> + <td> + <b> + <xsl:value-of select="profile:result/@time"/> ms</b> + </td> + <xsl:for-each select="profile:result"> + <td> + <b> + <xsl:value-of select="@time"/> ms </b> - </td> - </xsl:for-each> - </tr> - - </font> - </table> - - </column> - </row> - - </xsl:template> - - <xsl:template match="profile:result" mode="result"> - - <row> - <column title="{../@uri}"> - - <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center"> - - <tr> - <td align="left"><b>Components</b></td> - <td align="left"><b>Total time</b></td> - <td align="left"><b>Setup time</b></td> - <td align="left"><b>Processing time</b></td> - </tr> - - - <xsl:for-each select="profile:component"> - <tr> - <td> - <a href="?key={../../@key}&result={../@index}&[EMAIL PROTECTED]"> - <xsl:value-of select="@role"/> - <xsl:if test="@source"> + </td> + </xsl:for-each> + </tr> + </font> + </table> + </column> + </row> + </xsl:template> + <xsl:template match="profile:result" mode="result"> + <row> + <column title="{../@uri}"> + <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center"> + <tr> + <td align="left"> + <b>Components</b> + </td> + <td align="left"> + <b>Total time</b> + </td> + <td align="left"> + <b>Setup time</b> + </td> + <td align="left"> + <b>Processing time</b> + </td> + </tr> + <xsl:for-each select="profile:component"> + <tr> + <td><a href="?key={../../@key}&result={../@index}&[EMAIL PROTECTED]"> + <xsl:value-of select="@role"/> + <xsl:if test="@source"> (<xsl:value-of select="@source"/>) - </xsl:if> - </a> - </td> - <td> - <xsl:value-of select="@time"/> ms + </xsl:if></a> + </td> + <td> + <xsl:value-of select="@time"/> ms </td> - <td> - <xsl:value-of select="@setup"/> ms + <td> + <xsl:value-of select="@setup"/> ms </td> - <td> - <xsl:value-of select="@processing"/> ms + <td> + <xsl:value-of select="@processing"/> ms </td> - </tr> - </xsl:for-each> - - </table> - - </column> - - </row> - - <row> - - <column title="Request parameters"> - - <table width="100%" cellspacing="0" cellpadding="5" align="center"> - <font size="+0" face="arial,helvetica,sanserif" color="#000000"> - - <tr> - <td align="left"><b>Name</b></td> - <td align="left"><b>Value</b></td> - </tr> - - <xsl:for-each select="profile:environmentinfo/profile:request-parameters/profile:parameter"> - <tr> - <td><xsl:value-of select="@name"/></td> - <td><xsl:value-of select="@value"/></td> - </tr> - </xsl:for-each> - - <tr> - <td> </td> - <td> </td> - </tr> - - </font> - </table> - - </column> - - </row> - - <row> - - <column title="Session attributes"> - - <table width="100%" cellspacing="0" cellpadding="5" align="center"> - <font size="+0" face="arial,helvetica,sanserif" color="#000000"> - - <tr> - <td align="left"><b>Name</b></td> - <td align="left"><b>Value</b></td> - </tr> - - <xsl:for-each select="profile:environmentinfo/profile:session-attributes/profile:attribute"> - <tr> - <td><xsl:value-of select="@name"/></td> - <td><xsl:value-of select="@value"/></td> - </tr> - </xsl:for-each> - - <tr> - <td> </td> - <td> </td> - </tr> - - </font> - </table> - - </column> - </row> - - </xsl:template> - - <xsl:template match="profile:component" mode="fragment"> - - <row> - <column> - <xsl:attribute name="title"> - <xsl:value-of select="@role"/> - <xsl:if test="@source"> + </tr> + </xsl:for-each> + </table> + </column> + </row> + <row> + <column title="Request parameters"> + <table width="100%" cellspacing="0" cellpadding="5" align="center"> + <font size="+0" face="arial,helvetica,sanserif" color="#000000"> + <tr> + <td align="left"> + <b>Name</b> + </td> + <td align="left"> + <b>Value</b> + </td> + </tr> + <xsl:for-each select="profile:environmentinfo/profile:request-parameters/profile:parameter"> + <tr> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@value"/> + </td> + </tr> + </xsl:for-each> + <tr> + <td> </td> + <td> </td> + </tr> + </font> + </table> + </column> + </row> + <row> + <column title="Session attributes"> + <table width="100%" cellspacing="0" cellpadding="5" align="center"> + <font size="+0" face="arial,helvetica,sanserif" color="#000000"> + <tr> + <td align="left"> + <b>Name</b> + </td> + <td align="left"> + <b>Value</b> + </td> + </tr> + <xsl:for-each select="profile:environmentinfo/profile:session-attributes/profile:attribute"> + <tr> + <td> + <xsl:value-of select="@name"/> + </td> + <td> + <xsl:value-of select="@value"/> + </td> + </tr> + </xsl:for-each> + <tr> + <td> </td> + <td> </td> + </tr> + </font> + </table> + </column> + </row> + </xsl:template> + <xsl:template match="profile:component" mode="fragment"> + <row> + <column> + <xsl:attribute name="title"> + <xsl:value-of select="@role"/> + <xsl:if test="@source"> (<xsl:value-of select="@source"/>) </xsl:if> - </xsl:attribute> - - <xsl:choose> - <xsl:when test="profile:fragment"> - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> - <b>Fragment not available!</b> - </xsl:otherwise> - </xsl:choose> - - </column> - </row> - - </xsl:template> - + </xsl:attribute> + <xsl:choose> + <xsl:when test="profile:fragment"> + <xsl:apply-templates/> + </xsl:when> + <xsl:otherwise> + <b>Fragment not available!</b> + </xsl:otherwise> + </xsl:choose> + </column> + </row> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/project-to-text.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/project-to-text.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/project-to-text.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/project-to-text.xsl Mon Apr 9 19:07:17 2007 @@ -15,42 +15,32 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!--+ | Replace element for the value on the project descriptor | xmlns:for has to be replaced for the final version +--> - <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:for="http://apache.org/forrest"; version="1.0"> - <xsl:import href="copyover.xsl"/> - <xsl:template match="for:*"> <xsl:param name="config" select="//skinconfig"/> <xsl:choose> - - <!-- If we have nested for:* elements in the XML we're +<!-- If we have nested for:* elements in the XML we're transforming, recursively call ourselves with a narrowed scope for the skinconfig. --> - <xsl:when test="*"> <xsl:variable name="ln" select="local-name()"/> <xsl:apply-templates> <xsl:with-param name="config" select="$config/*[local-name() = $ln]"/> </xsl:apply-templates> </xsl:when> - - <!-- Ah ha! No more for:* children in the XML document being +<!-- Ah ha! No more for:* children in the XML document being transformed so we just select the value of this node from skinconfig (ie. $config). Note that the node we select from skinconfig may have nested elements and we'll get the values of all of them. --> - <xsl:otherwise> <xsl:variable name="ln" select="local-name()"/> <xsl:value-of select="$config/*[local-name() = $ln]"/> </xsl:otherwise> - </xsl:choose> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/project2text.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/project2text.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/project2text.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/project2text.xsl Mon Apr 9 19:07:17 2007 @@ -15,42 +15,32 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!--+ | Replace element for the value on the project descriptor | xmlns:for has to be replaced for the final version +--> - <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:for="http://apache.org/forrest"; version="1.0"> - <xsl:import href="copyover.xsl"/> - <xsl:template match="for:*"> <xsl:param name="config" select="//skinconfig"/> <xsl:choose> - - <!-- If we have nested for:* elements in the XML we're +<!-- If we have nested for:* elements in the XML we're transforming, recursively call ourselves with a narrowed scope for the skinconfig. --> - <xsl:when test="*"> <xsl:variable name="ln" select="local-name()"/> <xsl:apply-templates> <xsl:with-param name="config" select="$config/*[local-name() = $ln]"/> </xsl:apply-templates> </xsl:when> - - <!-- Ah ha! No more for:* children in the XML document being +<!-- Ah ha! No more for:* children in the XML document being transformed so we just select the value of this node from skinconfig (ie. $config). Note that the node we select from skinconfig may have nested elements and we'll get the values of all of them. --> - <xsl:otherwise> <xsl:variable name="ln" select="local-name()"/> <xsl:value-of select="$config/*[local-name() = $ln]"/> </xsl:otherwise> - </xsl:choose> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl Mon Apr 9 19:07:17 2007 @@ -15,39 +15,30 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - - <xsl:output method = "xml" + <xsl:output method = "xml" version="1.0" omit-xml-declaration="no" indent="yes" encoding="ISO-8859-1" doctype-system="book-cocoon-v10.dtd" doctype-public="-//APACHE//DTD Cocoon Documentation Book V1.0//EN" /> - - <!-- book to project --> - <xsl:template match="project"> - <book software="[EMAIL PROTECTED]" +<!-- book to project --> + <xsl:template match="project"> + <book software="[EMAIL PROTECTED]" copyright="[EMAIL PROTECTED]" title="{title}"> - - <xsl:for-each select = "//menu"> - <menu label="[EMAIL PROTECTED]"> - <xsl:for-each select = "item"> - <menu-item label="[EMAIL PROTECTED]" href="[EMAIL PROTECTED]"/> - </xsl:for-each> - </menu> - </xsl:for-each> - - </book> - </xsl:template> - - <xsl:template match="menu"/> - - <xsl:template match="item"/> - - + <xsl:for-each select = "//menu"> + <menu label="[EMAIL PROTECTED]"> + <xsl:for-each select = "item"> + <menu-item label="[EMAIL PROTECTED]" href="[EMAIL PROTECTED]"/> + </xsl:for-each> + </menu> + </xsl:for-each> + </book> + </xsl:template> + <xsl:template match="menu"/> + <xsl:template match="item"/> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/relativize-linkmap.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/relativize-linkmap.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/relativize-linkmap.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/relativize-linkmap.xsl Mon Apr 9 19:07:17 2007 @@ -54,24 +54,17 @@ --> - - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <xsl:param name="path"/> <xsl:param name="site-root"/> - <xsl:include href="dotdots.xsl"/> - - <!-- Path to site root, eg '../../' --> +<!-- Path to site root, eg '../../' --> <xsl:variable name="root"> <xsl:call-template name="dotdots"> <xsl:with-param name="path" select="$path"/> </xsl:call-template> </xsl:variable> - <xsl:template match="@href"> - <xsl:attribute name="href"> <xsl:choose> <xsl:when test="contains(., ':') and not(contains(substring-before(., ':'), '/'))"> @@ -82,29 +75,23 @@ contains(., '.jpg') or contains(., '.gif') or contains(., '.tif')"> - <!-- Image links are always relative --> - <xsl:value-of select="$root"/><xsl:value-of select="."/> +<!-- Image links are always relative --> + <xsl:value-of select="$root"/> + <xsl:value-of select="."/> </xsl:when> - - - <!-- PDFs can handle inline images, but everything else must become an +<!-- PDFs can handle inline images, but everything else must become an external link --> <xsl:when test="contains($path, '.pdf')"> - - <!-- Links to outside a PDF are all absolute --> +<!-- Links to outside a PDF are all absolute --> <xsl:value-of select="concat($site-root, .)"/> - </xsl:when> <xsl:otherwise> - - <!-- Links outside a HTML are relative --> - <xsl:value-of select="$root"/><xsl:value-of select="."/> - +<!-- Links outside a HTML are relative --> + <xsl:value-of select="$root"/> + <xsl:value-of select="."/> </xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:template> - <xsl:include href="copyover.xsl"/> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/replaceCharsInString.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/replaceCharsInString.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/replaceCharsInString.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/replaceCharsInString.xsl Mon Apr 9 19:07:17 2007 @@ -19,25 +19,24 @@ This stylesheet contains templates for converting documentv11 to HTML. See the imported document-to-html.xsl for details. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <!-- Template that does the replacement of characters in a string --> - <xsl:template name="replaceCharsInString"> - <xsl:param name="stringIn"/> - <xsl:param name="charsIn"/> - <xsl:param name="charsOut"/> - <xsl:choose> - <xsl:when test="contains($stringIn,$charsIn)"> - <xsl:value-of select="concat(substring-before($stringIn,$charsIn),$charsOut)"/> - <xsl:call-template name="replaceCharsInString"> - <xsl:with-param name="stringIn" select="substring-after($stringIn,$charsIn)"/> - <xsl:with-param name="charsIn" select="$charsIn"/> - <xsl:with-param name="charsOut" select="$charsOut"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$stringIn"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> +<!-- Template that does the replacement of characters in a string --> + <xsl:template name="replaceCharsInString"> + <xsl:param name="stringIn"/> + <xsl:param name="charsIn"/> + <xsl:param name="charsOut"/> + <xsl:choose> + <xsl:when test="contains($stringIn,$charsIn)"> + <xsl:value-of select="concat(substring-before($stringIn,$charsIn),$charsOut)"/> + <xsl:call-template name="replaceCharsInString"> + <xsl:with-param name="stringIn" select="substring-after($stringIn,$charsIn)"/> + <xsl:with-param name="charsIn" select="$charsIn"/> + <xsl:with-param name="charsOut" select="$charsOut"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$stringIn"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/rss-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/rss-to-document.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/rss-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/rss-to-document.xsl Mon Apr 9 19:07:17 2007 @@ -16,24 +16,27 @@ limitations under the License. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - -<xsl:template match="rss"> - <document> - <header> - <title><xsl:value-of select="channel/title"/></title> - </header> - <body> - <xsl:apply-templates select="channel/item"/> - </body> - </document> -</xsl:template> - -<xsl:template match="item"> - <section> - <title><xsl:value-of select="title" disable-output-escaping="yes"/></title> - <p><link href="{link}"><xsl:value-of select="link"/></link></p> - <p><xsl:value-of select="description" disable-output-escaping="yes"/></p> - </section> -</xsl:template> - + <xsl:template match="rss"> + <document> + <header> + <title><xsl:value-of select="channel/title"/></title> + </header> + <body> + <xsl:apply-templates select="channel/item"/> + </body> + </document> + </xsl:template> + <xsl:template match="item"> + <section> + <title><xsl:value-of select="title" disable-output-escaping="yes"/></title> + <p> + <link href="{link}"> + <xsl:value-of select="link"/> + </link> + </p> + <p> + <xsl:value-of select="description" disable-output-escaping="yes"/> + </p> + </section> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/rssissues-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/rssissues-to-document.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/rssissues-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/rssissues-to-document.xsl Mon Apr 9 19:07:17 2007 @@ -16,30 +16,36 @@ limitations under the License. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - -<xsl:template match="rss"> - <document> - <header> - <title>Open issues for the next release</title> - </header> - <body> - <note>These are the top 25 open issues for the next release that are scheduled in our - <link href="http://forrest.apache.org/issues.html";>issue tracking system</link> - (see - <link href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?pid=12310000&resolutionIds=-1&tempMax=1000&reset=true";>all</link> open issues). - The listing below is regenerated on each Forrest run.</note> - <xsl:apply-templates select="channel/item"/> - </body> - </document> -</xsl:template> - -<xsl:template match="item"> - <section> - <title><xsl:value-of select="title" disable-output-escaping="yes"/></title> - <p><link href="{link}"><xsl:value-of select="link"/></link></p> - <!--<p><xsl:value-of select="description" disable-output-escaping="yes" /></p>--> - <p><xsl:value-of select="description" /></p> - </section> -</xsl:template> - + <xsl:template match="rss"> + <document> + <header> + <title>Open issues for the next release</title> + </header> + <body> + <note> + These are the top 25 open issues for the next release that are + scheduled in our + <link href="http://forrest.apache.org/issues.html";>issue tracking + system</link> (see + <link href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?pid=12310000&resolutionIds=-1&tempMax=1000&reset=true";>all</link> + open issues). The listing below is regenerated on each Forrest run. + </note> + <xsl:apply-templates select="channel/item"/> + </body> + </document> + </xsl:template> + <xsl:template match="item"> + <section> + <title><xsl:value-of select="title" disable-output-escaping="yes"/></title> + <p> + <link href="{link}"> + <xsl:value-of select="link"/> + </link> + </p> +<!--<p><xsl:value-of select="description" disable-output-escaping="yes" /></p>--> + <p> + <xsl:value-of select="description" /> + </p> + </section> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/site-to-book.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/site-to-book.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/site-to-book.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/site-to-book.xsl Mon Apr 9 19:07:17 2007 @@ -15,22 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Stylesheet for generating book.xml from a suitably hierarchical site.xml file. The project info is currently hardcoded, but since it isn't used anyway that isn't a major problem. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:f="http://apache.org/forrest/linkmap/1.0"; exclude-result-prefixes="f"> - <xsl:param name="path"/> <xsl:output doctype-system="book-cocoon-v10.dtd" doctype-public="-//APACHE//DTD Cocoon Documentation Book V1.0//EN"/> - <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <!-- FIXME: This is a workaround to Issue FOR-675 and commons-jxpath-1.2 --> <!-- <xsl:template match="f:site"> @@ -43,29 +38,25 @@ <xsl:apply-templates/> </book> </xsl:template> - <xsl:template match="*/*"> <xsl:choose> - <!-- No label, abandon the whole subtree --> - <xsl:when test="not(@label)"> - </xsl:when> - <!-- Below here, everything has a label, and is therefore considered "for display" --> - - <!-- No children -> must be a menu item --> - <!-- Has children, but they are not for display -> menu item --> +<!-- No label, abandon the whole subtree --> + <xsl:when test="not(@label)"></xsl:when> +<!-- Below here, everything has a label, and is therefore considered "for display" --> +<!-- No children -> must be a menu item --> +<!-- Has children, but they are not for display -> menu item --> <xsl:when test="count(*) = 0 or count(*) > 0 and (not(*/@label))"> <menu-item> - <xsl:copy-of select="@*"/> + <xsl:copy-of select="@*"/> </menu-item> </xsl:when> - <!-- Anything else is considered a menu --> +<!-- Anything else is considered a menu --> <xsl:otherwise> <menu> - <xsl:copy-of select="@*"/> + <xsl:copy-of select="@*"/> <xsl:apply-templates/> </menu> </xsl:otherwise> </xsl:choose> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl Mon Apr 9 19:07:17 2007 @@ -45,10 +45,8 @@ </site> --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:l="http://apache.org/forrest/linkmap/1.0";> - - <!-- Return a value for a node's @tab, either using an existing @tab or the first ancestor's --> +<!-- Return a value for a node's @tab, either using an existing @tab or the first ancestor's --> <xsl:template name="gettab"> <xsl:param name="node"/> <xsl:choose> @@ -62,7 +60,6 @@ </xsl:when> </xsl:choose> </xsl:template> - <xsl:template match="//*"> <xsl:variable name="newtab"> <xsl:call-template name="gettab"> @@ -70,14 +67,13 @@ </xsl:call-template> </xsl:variable> <xsl:copy> - <!-- <xsl:if test="not(normalize-space($newtab)='')"> --> - <xsl:attribute name="tab"> - <xsl:value-of select="$newtab"/> - </xsl:attribute> - <xsl:apply-templates select="@*|node()"/> +<!-- <xsl:if test="not(normalize-space($newtab)='')"> --> + <xsl:attribute name="tab"> + <xsl:value-of select="$newtab"/> + </xsl:attribute> + <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> - <xsl:template match="@*|node()" priority="-1"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> Modified: forrest/trunk/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl Mon Apr 9 19:07:17 2007 @@ -20,23 +20,19 @@ probably be done with 2 lines of XQuery. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:l="http://apache.org/forrest/linkmap/1.0";> <xsl:import href="pathutils.xsl"/> - <xsl:param name="path" select="'index'"/> - <xsl:variable name="tab"> <xsl:variable name="path-noext"> - <xsl:call-template name="path-noext"> - <xsl:with-param name="path" select="$path"/> - </xsl:call-template> - </xsl:variable> + <xsl:call-template name="path-noext"> + <xsl:with-param name="path" select="$path"/> + </xsl:call-template> + </xsl:variable> <xsl:value-of select="string(//*[starts-with(@href, $path-noext)]/@tab)"/> </xsl:variable> - <xsl:template match="/*"> - <!-- +<!-- <xsl:message>## path is <xsl:value-of select="$path"/></xsl:message> <xsl:message>## tab is <xsl:value-of select="$tab"/></xsl:message> --> @@ -44,14 +40,12 @@ <xsl:apply-templates/> </xsl:copy> </xsl:template> - - <!-- Ignore external references, as they are only useful for link mapping, not +<!-- Ignore external references, as they are only useful for link mapping, not creating menus --> <xsl:template match="l:external-refs"/> - <xsl:template match="*"> <xsl:choose> - <!-- Take out the first test to not duplicate other tabs' content in first menu --> +<!-- Take out the first test to not duplicate other tabs' content in first menu --> <xsl:when test="$tab='' or @tab=$tab"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> @@ -62,7 +56,6 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template match="@*|node()" priority="-1"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> Modified: forrest/trunk/main/webapp/resources/stylesheets/strip-doctype.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/strip-doctype.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/strip-doctype.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/strip-doctype.xsl Mon Apr 9 19:07:17 2007 @@ -18,17 +18,14 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns="http://www.w3.org/1999/xhtml";> - - <xsl:output + <xsl:output omit-xml-declaration="no" method="xml" indent="yes"/> - - <!-- Identity transformation template --> - <xsl:template match="/ | @* | * | comment() | processing-instruction() | text()"> - <xsl:copy> - <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()"/> - </xsl:copy> - </xsl:template> - +<!-- Identity transformation template --> + <xsl:template match="/ | @* | * | comment() | processing-instruction() | text()"> + <xsl:copy> + <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()"/> + </xsl:copy> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/strip-i18n-remains.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/strip-i18n-remains.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/strip-i18n-remains.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/strip-i18n-remains.xsl Mon Apr 9 19:07:17 2007 @@ -18,13 +18,9 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:i18n="http://apache.org/cocoon/i18n/2.1";> - <xsl:import href="copyover.xsl"/> - <xsl:template match="i18n:text"> <xsl:apply-templates/> </xsl:template> - <xsl:template match="@i18n:*"/> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/text-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/text-to-document.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/text-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/text-to-document.xsl Mon Apr 9 19:07:17 2007 @@ -15,30 +15,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!--+ | Transforms TextGenerator output to document format. +--> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <xsl:param name="filename"/> - <xsl:template match="/"> <document> <header> - <title> - <xsl:value-of select="$filename"/> - </title> + <title><xsl:value-of select="$filename"/></title> </header> <body> <source> - <!-- is System.getProperty("line.separator") --> - <xsl:value-of select="translate(node(),' ',' ')"/> +<!-- is System.getProperty("line.separator") --> + <xsl:value-of select="translate(node(),' ',' ')"/> </source> </body> </document> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/upgrade-skinconf.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/upgrade-skinconf.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/upgrade-skinconf.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/upgrade-skinconf.xsl Mon Apr 9 19:07:17 2007 @@ -19,47 +19,39 @@ | Upgrade skin from previous versions. | +--> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - -<xsl:import href="copyover.xsl"/> - + <xsl:import href="copyover.xsl"/> <xsl:template match="toc/@level"> - <xsl:attribute name="max-depth"> - <xsl:value-of select="."/> - </xsl:attribute> - <xsl:apply-templates /> + <xsl:attribute name="max-depth"> + <xsl:value-of select="."/> + </xsl:attribute> + <xsl:apply-templates /> </xsl:template> - - <!--Search Element--> - <!--First ignore these elements to avoid been copied.--> +<!--Search Element--> +<!--First ignore these elements to avoid been copied.--> <xsl:template match="disable-lucene|searchsite-name|searchsite-domain|comment()"/> <xsl:template match="disable-search"> <xsl:if test=".='false'"> <xsl:element name="search"> - <xsl:apply-templates select="../disable-lucene" mode="search-enable"/> - <xsl:apply-templates select="../searchsite-name" mode="search-enable"/> - <xsl:apply-templates select="../searchsite-domain" mode="search-enable"/> + <xsl:apply-templates select="../disable-lucene" mode="search-enable"/> + <xsl:apply-templates select="../searchsite-name" mode="search-enable"/> + <xsl:apply-templates select="../searchsite-domain" mode="search-enable"/> </xsl:element> </xsl:if> </xsl:template> - <xsl:template match="disable-lucene" mode="search-enable"> <xsl:if test=".='false'"> <xsl:attribute name="provider">lucene</xsl:attribute> </xsl:if> </xsl:template > - <xsl:template match="searchsite-name" mode="search-enable"> <xsl:attribute name="name"> - <xsl:value-of select="."/> + <xsl:value-of select="."/> </xsl:attribute> </xsl:template> - <xsl:template match="searchsite-domain" mode="search-enable"> <xsl:attribute name="domain"> - <xsl:value-of select="."/> + <xsl:value-of select="."/> </xsl:attribute> </xsl:template > - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl Mon Apr 9 19:07:17 2007 @@ -27,12 +27,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:lucene="http://apache.org/cocoon/lucene/1.0"; version="1.0"> - - <!-- The URL of the document which the indexing information stems +<!-- The URL of the document which the indexing information stems from --> <xsl:param name="document-url"/> - - <!-- Creates a lucene:document element, and assigns the url +<!-- Creates a lucene:document element, and assigns the url attribute as passed in via top-level param --> <xsl:template match="/"> <lucene:document url="{$document-url}"> @@ -42,8 +40,7 @@ </contents> </lucene:document> </xsl:template> - - <!-- Copies document header, title, and version, and instructs +<!-- Copies document header, title, and version, and instructs Lucene to store the contents of these elements (in addition to indexing them) --> <xsl:template match="/document/header/title | @@ -56,8 +53,7 @@ <xsl:apply-templates/> </xsl:element> </xsl:template> - - <!-- Copies authors/person, and instructs +<!-- Copies authors/person, and instructs Lucene to store the contents of the person element and to index the email and name attributes --> <xsl:template match="/document/header/authors/person" @@ -67,17 +63,13 @@ <xsl:value-of select="@name"/> </author> </xsl:template> - - <!-- Everything else from document/header should be ignored --> +<!-- Everything else from document/header should be ignored --> <xsl:template match="/document/header/notice | /document/header/type" - mode="store"> - </xsl:template> - - <!-- Copies an element and its attributes (text content is handled + mode="store"></xsl:template> +<!-- Copies an element and its attributes (text content is handled by implicit default template) --> <xsl:template match="*"> <xsl:apply-templates/> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/main/webapp/resources/stylesheets/xml-to-pretty.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/xml-to-pretty.xsl?view=diff&rev=526996&r1=526995&r2=526996 ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/xml-to-pretty.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/xml-to-pretty.xsl Mon Apr 9 19:07:17 2007 @@ -1,34 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- Parts of this stylesheet were obtained from the XSLT FAQ: http://www.dpawson.co.uk/xsl/ --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - - <xsl:strip-space elements="*"/> - <xsl:param name="indent-increment" select="' '"/> - - <xsl:template match="*"> - <xsl:param name="indent" select="'
'"/> - <xsl:value-of select="$indent"/> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates> - <xsl:with-param name="indent" + <xsl:strip-space elements="*"/> + <xsl:param name="indent-increment" select="' '"/> + <xsl:template match="*"> + <xsl:param name="indent" select="'
'"/> + <xsl:value-of select="$indent"/> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates> + <xsl:with-param name="indent" select="concat($indent, $indent-increment)"/> - </xsl:apply-templates> - <xsl:if test="*"> - <xsl:value-of select="$indent"/> - </xsl:if> - </xsl:copy> - </xsl:template> - - <xsl:template match="comment()|processing-instruction()"> - <xsl:copy/> - </xsl:template> - + </xsl:apply-templates> + <xsl:if test="*"> + <xsl:value-of select="$indent"/> + </xsl:if> + </xsl:copy> + </xsl:template> + <xsl:template match="comment()|processing-instruction()"> + <xsl:copy/> + </xsl:template> </xsl:stylesheet>
