bloritsch 01/02/28 07:29:48
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
webapp Tag: xml-cocoon2 sitemap.xmap
Log:
Fixed sitemap problem with double-rendering of <parameter> elements.
Also, optimized the sitemap actions a wee bit.
Revision Changes Path
No revision
No revision
1.1.2.86 +4 -2
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.85
retrieving revision 1.1.2.86
diff -u -r1.1.2.85 -r1.1.2.86
--- sitemap.xsl 2001/02/27 15:43:39 1.1.2.85
+++ sitemap.xsl 2001/02/28 15:29:45 1.1.2.86
@@ -94,7 +94,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.1.2.85 2001/02/27 15:43:39
bloritsch Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.86 2001/02/28 15:29:45
bloritsch 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"/>";
@@ -882,7 +882,9 @@
<!-- collect parameter definitions -->
<xsl:template match="map:pipeline//parameter | map:action-set//parameter">
<xsl:param name="param"/>
- <xsl:value-of select="$param"/>.setParameter ("<xsl:value-of
select="@name"/>", substitute(listOfMaps, "<xsl:value-of select="@value"/>"));
+ <xsl:if test="not($param='')">
+ <xsl:value-of select="$param"/>.setParameter ("<xsl:value-of
select="@name"/>", substitute(listOfMaps, "<xsl:value-of select="@value"/>"));
+ </xsl:if>
</xsl:template>
<!-- FIXME:(GP) is this still valid? -->
No revision
No revision
1.1.2.45 +9 -13 xml-cocoon/webapp/Attic/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/sitemap.xmap,v
retrieving revision 1.1.2.44
retrieving revision 1.1.2.45
diff -u -r1.1.2.44 -r1.1.2.45
--- sitemap.xmap 2001/02/27 17:08:12 1.1.2.44
+++ sitemap.xmap 2001/02/28 15:29:48 1.1.2.45
@@ -119,15 +119,9 @@
<map:action-sets>
<map:action-set name="employee">
- <map:act type="add-employee" action="Add">
- <parameter name="form-descriptor"
value="context://docs/samples/forms/employee.xml"/>
- </map:act>
- <map:act type="del-employee" action="Delete">
- <parameter name="form-descriptor"
value="context://docs/samples/forms/employee.xml"/>
- </map:act>
- <map:act type="upd-employee" action="Update">
- <parameter name="form-descriptor"
value="context://docs/samples/forms/employee.xml"/>
- </map:act>
+ <map:act type="add-employee" action="Add"/>
+ <map:act type="del-employee" action="Delete"/>
+ <map:act type="upd-employee" action="Update"/>
</map:action-set>
</map:action-sets>
@@ -290,10 +284,12 @@
<!-- ========================== Forms =================================
-->
<map:match pattern="forms/employee">
- <map:act set="employee"/>
- <map:generate type="serverpages" src="docs/samples/forms/employee.xsp"/>
- <map:transform src="stylesheets/dynamic-page2html.xsl"/>
- <map:serialize/>
+ <map:act set="employee">
+ <parameter name="form-descriptor"
value="context://docs/samples/forms/employee.xml"/>
+ <map:generate type="serverpages"
src="docs/samples/forms/employee.xsp"/>
+ <map:transform src="stylesheets/dynamic-page2html.xsl"/>
+ <map:serialize/>
+ </map:act>
</map:match>
<map:match pattern="forms/*">
