cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl

[vgritsenko]

vgritsenko    02/03/21 18:20:24

  Modified:    src/java/org/apache/cocoon/components/language/markup/sitemap/java
                        sitemap.xsl
  Log:
  Fix bug #7246. Patch by Michael Melhem <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.11      +15 -15    
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sitemap.xsl       1 Mar 2002 15:09:04 -0000       1.10
  +++ sitemap.xsl       22 Mar 2002 02:20:24 -0000      1.11
  @@ -215,7 +215,7 @@
        * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Berin Loritsch&lt;/a&gt;
        * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Nicola Ken 
Barozzi&lt;/a&gt;
        * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Peter 
Royal&lt;/a&gt;
  -     * @version CVS $Id: sitemap.xsl,v 1.10 2002/03/01 15:09:04 haul Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11 2002/03/22 02:20:24 vgritsenko Exp $
        */
       public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
         static final String LOCATION = "<xsl:value-of select="translate(@file-path, 
'/', '.')"/>.<xsl:value-of select="@file-name"/>";
  @@ -842,20 +842,6 @@
         </xsl:call-template>
       </xsl:variable>
   
  -    <!-- Define parameters for this matcher (if present) -->
  -    <xsl:if test="map:parameter">
  -      param = new Parameters ();
  -      <xsl:apply-templates select="map:parameter">
  -        <xsl:with-param name="param">param</xsl:with-param>
  -      </xsl:apply-templates>
  -    </xsl:if>
  -    <xsl:variable name="component-param">
  -      <xsl:choose>
  -        <xsl:when test="map:parameter">param</xsl:when>
  -        <xsl:otherwise>Parameters.EMPTY_PARAMETERS</xsl:otherwise>
  -      </xsl:choose>
  -    </xsl:variable>
  -
       <xsl:text>// method for handling "</xsl:text><xsl:value-of select="@pattern"/>"
       private final boolean match<xsl:value-of select="generate-id(.)"/>(
                                       SitemapRedirector redirector,
  @@ -869,6 +855,20 @@
           String cocoon_view = environment.getView();
           String cocoon_action = environment.getAction();
           final boolean debug_enabled = getLogger().isDebugEnabled();
  +
  +        <!-- Define parameters for this matcher (if present) -->
  +        <xsl:if test="map:parameter">
  +          param = new Parameters ();
  +          <xsl:apply-templates select="map:parameter">
  +            <xsl:with-param name="param">param</xsl:with-param>
  +          </xsl:apply-templates>
  +        </xsl:if>
  +        <xsl:variable name="component-param">
  +          <xsl:choose>
  +            <xsl:when test="map:parameter">param</xsl:when>
  +            <xsl:otherwise>Parameters.EMPTY_PARAMETERS</xsl:otherwise>
  +          </xsl:choose>
  +        </xsl:variable>
   
           if ((map = matches("<xsl:value-of select="$matcher-type"/>", <xsl:value-of 
select="$matcher-name"/>, <xsl:apply-templates select="@pattern"/>, <xsl:value-of 
select="$component-param"/>, objectModel)) != null) {
             if (debug_enabled) getLogger().debug("Matched <xsl:value-of 
select="$matcher-type"/> pattern <xsl:value-of 
select="XSLTFactoryLoader:escape($factory-loader, @pattern)"/>");
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]