Return-Path: <giacomo@locus.apache.org>
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 78646 invoked by uid 1041); 4 Sep 2000 18:54:22 -0000
Date: 4 Sep 2000 18:54:22 -0000
Message-ID: <20000904185422.78626.qmail@locus.apache.org>
From: giacomo@locus.apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit:
 xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java
 sitemap.xsl

giacomo     00/09/04 11:54:21

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: xml-cocoon2 sitemap.xsl
  Log:
  Fixed sitemap stylesheet to handle component labels correctly
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.30  +5 -8      xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
  retrieving revision 1.1.2.29
  retrieving revision 1.1.2.30
  diff -u -r1.1.2.29 -r1.1.2.30
  --- sitemap.xsl	2000/09/02 21:12:34	1.1.2.29
  +++ sitemap.xsl	2000/09/04 18:54:20	1.1.2.30
  @@ -11,7 +11,7 @@
   
   <!--
    * @author &lt;a href="mailto:Giacomo.Pati@pwr.ch"&gt;Giacomo Pati&lt;/a&gt;
  - * @version CVS $Revision: 1.1.2.29 $ $Date: 2000/09/02 21:12:34 $
  + * @version CVS $Revision: 1.1.2.30 $ $Date: 2000/09/04 18:54:20 $
   -->
   
   <!-- Sitemap Core logicsheet for the Java language -->
  @@ -722,14 +722,11 @@
         </xsl:if>
       </xsl:variable>
       <xsl:if test="$component-label">
  -      <xsl:variable name="component-view">
  -        <xsl:value-of select="/map:sitemap/map:views/map:view[@generate-from=$component-label]/@name"/>
  -      </xsl:variable>
  -      <xsl:if test="/map:sitemap/map:views/map:view[@generate-from=$component-label]">
  -        if ("<xsl:value-of select="$component-view"/>".equals(cocoon_view)) {
  -          return view_<xsl:value-of select="translate($component-view, '- ', '__')"/> (pipeline, listOfLists, environment);
  +      <xsl:for-each select="/map:sitemap/map:views/map:view[@generate-from=$component-label]">
  +        if ("<xsl:value-of select="@name"/>".equals(cocoon_view)) {
  +          return view_<xsl:value-of select="translate(@name, '- ', '__')"/> (pipeline, listOfLists, environment);
           }
  -      </xsl:if>
  +      </xsl:for-each>
       </xsl:if>
     </xsl:template>