You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ha...@apache.org on 2002/08/11 22:10:38 UTC

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

haul        2002/08/11 13:10:38

  Modified:    src/java/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_2_0_3_branch sitemap.xsl
  Log:
    <action dev="CH" type="add">
     Backport usage of InputModules to compiled sitemap.
    </action>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.6  +6 -6      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
  retrieving revision 1.11.2.5
  retrieving revision 1.11.2.6
  diff -u -r1.11.2.5 -r1.11.2.6
  --- sitemap.xsl	8 Aug 2002 03:21:28 -0000	1.11.2.5
  +++ sitemap.xsl	11 Aug 2002 20:10:38 -0000	1.11.2.6
  @@ -1326,7 +1326,7 @@
           map = new HashMap(1);
         </xsl:otherwise>
       </xsl:choose>
  -      String methodName = "resource_" + substitute(listOfMaps, "<xsl:value-of select="translate(@resource, '- ', '__')"/>");
  +      String methodName = "resource_" + substitute(listOfMaps, "<xsl:value-of select="translate(@resource, '- ', '__')"/>", environment);
         listOfMaps.add(map);
         this.dumpParameters(listOfMaps);
         Class[] argTypes = new Class[] {StreamPipeline.class, EventPipeline.class, List.class, Environment.class, String.class, Boolean.TYPE};
  @@ -1363,7 +1363,7 @@
           </xsl:if>
            Class[] argTypes = new Class[] {StreamPipeline.class, EventPipeline.class, List.class, Environment.class, String.class, Boolean.TYPE};
            Object[] argValues = new Object[] {pipeline, eventPipeline, listOfMaps, environment, cocoon_view, new Boolean(internalRequest)};
  -         String methodName = "resource_" + substitute(listOfMaps, "<xsl:value-of select="translate(@resource, '- ', '__')"/>");
  +         String methodName = "resource_" + substitute(listOfMaps, "<xsl:value-of select="translate(@resource, '- ', '__')"/>",environment);
            if (true) return invokeMethod(methodName, argTypes, argValues);
         </xsl:when>
   
  @@ -1518,7 +1518,7 @@
     <xsl:template match="@*">
       <xsl:choose>
         <xsl:when test="XSLTFactoryLoader:hasSubstitutions($factory-loader, .)">
  -        <xsl:text>substitute(listOfMaps, "</xsl:text><xsl:value-of select="XSLTFactoryLoader:escape($factory-loader, .)"/><xsl:text>")</xsl:text>
  +        <xsl:text>substitute(listOfMaps, "</xsl:text><xsl:value-of select="XSLTFactoryLoader:escape($factory-loader, .)"/><xsl:text>", environment)</xsl:text>
         </xsl:when>
         <xsl:otherwise>"<xsl:value-of select="XSLTFactoryLoader:escape($factory-loader, .)"/>"</xsl:otherwise>
       </xsl:choose>
  @@ -1764,7 +1764,7 @@
       </xsl:variable>
       <xsl:choose>
         <xsl:when test="$result=$default"><xsl:value-of select="$default"/></xsl:when>
  -      <xsl:when test="contains($result, '{')">substitute(listOfMaps, "<xsl:value-of select="$result"/>")</xsl:when>
  +      <xsl:when test="contains($result, '{')">substitute(listOfMaps, "<xsl:value-of select="$result"/>", environment)</xsl:when>
         <xsl:otherwise>"<xsl:value-of select="$result"/>"</xsl:otherwise>
       </xsl:choose>
     </xsl:template>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org