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

[giacomo]

giacomo     00/09/10 04:00:45

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: xml-cocoon2 sitemap.xsl
  Log:
  we shouldn't check for a view a view block
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.35  +16 -14    
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.34
  retrieving revision 1.1.2.35
  diff -u -r1.1.2.34 -r1.1.2.35
  --- sitemap.xsl       2000/09/10 10:09:15     1.1.2.34
  +++ sitemap.xsl       2000/09/10 11:00:44     1.1.2.35
  @@ -11,7 +11,7 @@
   
   <!--
    * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Giacomo Pati&lt;/a&gt;
  - * @version CVS $Revision: 1.1.2.34 $ $Date: 2000/09/10 10:09:15 $
  + * @version CVS $Revision: 1.1.2.35 $ $Date: 2000/09/10 11:00:44 $
   -->
   
   <!-- Sitemap Core logicsheet for the Java language -->
  @@ -722,20 +722,22 @@
         </xsl:otherwise>
       </xsl:choose>
       <!-- view/label check -->
  -    <xsl:variable name="component-label">
  -      <xsl:if test="$prefix='generator'">
  -        <xsl:value-of 
select="/map:sitemap/map:components/map:generators/map:[EMAIL 
PROTECTED]/@label"/>
  -      </xsl:if>
  -      <xsl:if test="$prefix='transformer'">
  -        <xsl:value-of 
select="/map:sitemap/map:components/map:transformers/map:[EMAIL 
PROTECTED]/@label"/>
  +    <xsl:if test="not(ancestor::map:views)">
  +      <xsl:variable name="component-label">
  +        <xsl:if test="$prefix='generator'">
  +          <xsl:value-of 
select="/map:sitemap/map:components/map:generators/map:[EMAIL 
PROTECTED]/@label"/>
  +        </xsl:if>
  +        <xsl:if test="$prefix='transformer'">
  +          <xsl:value-of 
select="/map:sitemap/map:components/map:transformers/map:[EMAIL 
PROTECTED]/@label"/>
  +        </xsl:if>
  +      </xsl:variable>
  +      <xsl:if test="$component-label">
  +        <xsl:for-each select="/map:sitemap/map:views/map:[EMAIL PROTECTED]">
  +          if ("<xsl:value-of select="@name"/>".equals(cocoon_view)) {
  +            return view_<xsl:value-of select="translate(@name, '- ', 
'__')"/> (pipeline, listOfLists, environment);
  +          }
  +        </xsl:for-each>
         </xsl:if>
  -    </xsl:variable>
  -    <xsl:if test="$component-label">
  -      <xsl:for-each select="/map:sitemap/map:views/map:[EMAIL PROTECTED]">
  -        if ("<xsl:value-of select="@name"/>".equals(cocoon_view)) {
  -          return view_<xsl:value-of select="translate(@name, '- ', '__')"/> 
(pipeline, listOfLists, environment);
  -        }
  -      </xsl:for-each>
       </xsl:if>
     </xsl:template>