haul 02/03/01 07:09:04
Modified: src/java/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
Log:
Fixed lookup order as reported by Harry Lai in
"Resources and parameter scopes"
(resource name was resolved only after new map was pushed)
Revision Changes Path
1.10 +2 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.xsl 14 Feb 2002 01:05:30 -0000 1.9
+++ sitemap.xsl 1 Mar 2002 15:09:04 -0000 1.10
@@ -215,7 +215,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken
Barozzi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter
Royal</a>
- * @version CVS $Id: sitemap.xsl,v 1.9 2002/02/14 01:05:30 vgritsenko Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.10 2002/03/01 15:09:04 haul 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"/>";
@@ -1321,11 +1321,11 @@
map = new HashMap(1);
</xsl:otherwise>
</xsl:choose>
+ String methodName = "resource_" + substitute(listOfMaps, "<xsl:value-of
select="translate(@resource, '- ', '__')"/>");
listOfMaps.add(map);
this.dumpParameters(listOfMaps);
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, '- ', '__')"/>");
if (true) return invokeMethod(methodName, argTypes, argValues);
</xsl:template><!-- match="map:call" -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
