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

[vgritsenko]

vgritsenko    01/12/13 09:11:55

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_20_branch sitemap.xsl
  Log:
  fix label checks (contains_view was erroneously called with empty label list)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.42 +4 -4      
xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
  retrieving revision 1.11.2.41
  retrieving revision 1.11.2.42
  diff -u -r1.11.2.41 -r1.11.2.42
  --- sitemap.xsl       2001/12/07 10:18:25     1.11.2.41
  +++ sitemap.xsl       2001/12/13 17:11:54     1.11.2.42
  @@ -126,7 +126,7 @@
        *
        * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
        * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  -     * @version CVS $Id: sitemap.xsl,v 1.11.2.41 2001/12/07 10:18:25 sylvain Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11.2.42 2001/12/13 17:11:54 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"/>";
  @@ -1486,7 +1486,7 @@
       }
   
       <!-- process attached labels to the map:aggregate element -->
  -    <xsl:if test="(@label)">
  +    <xsl:if test="@label">
         <xsl:call-template name="view-label">
           <xsl:with-param name="label"><xsl:value-of 
select="@label"/></xsl:with-param>
         </xsl:call-template>
  @@ -1742,7 +1742,7 @@
           </xsl:for-each>
         </xsl:if>
   
  -      <xsl:if test="(@label)">
  +      <xsl:if test="@label">
           <xsl:call-template name="view-label">
             <xsl:with-param name="label"><xsl:value-of 
select="@label"/></xsl:with-param>
           </xsl:call-template>
  @@ -1756,7 +1756,7 @@
             <xsl:value-of 
select="/map:sitemap/map:components/map:transformers/map:transformer[@name=$component-type]/@label"/>
           </xsl:if>
         </xsl:variable>
  -      <xsl:if test="$component-label">
  +      <xsl:if test="string-length($component-label) &gt; 0">
           <xsl:call-template name="view-label">
             <xsl:with-param name="label"><xsl:value-of 
select="$component-label"/></xsl:with-param>
           </xsl:call-template>
  
  
  

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