You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/09/05 16:20:16 UTC
svn commit: r278744 - /lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
Author: andreas
Date: Mon Sep 5 07:20:13 2005
New Revision: 278744
URL: http://svn.apache.org/viewcvs?rev=278744&view=rev
Log:
Default Pub: Allow resource types without custom XSLT
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
Modified: lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap?rev=278744&r1=278743&r2=278744&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap Mon Sep 5 07:20:13 2005
@@ -117,13 +117,28 @@
<map:part src="cocoon://modules/sitetree/{2}/{3}/search/{5}.xml"/>
<map:part src="cocoon://modules/{page-envelope:document-type}/{1}.xml"/>
</map:aggregate>
- <map:transform src="fallback://xslt/page2xhtml-{4}.xsl">
- <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
- <map:parameter name="url" value="{5}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
- <map:parameter name="document-type" value="{page-envelope:document-type}"/>
- <map:parameter name="language" value="{page-envelope:document-language}"/>
- </map:transform>
+
+ <map:select type="resource-exists">
+ <map:when test="xslt/page2xhtml-{4}.xsl">
+ <map:transform src="fallback://xslt/page2xhtml-{4}.xsl">
+ <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
+ <map:parameter name="url" value="{5}"/>
+ <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-type" value="{page-envelope:document-type}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ </map:transform>
+ </map:when>
+ <map:otherwise>
+ <map:transform src="xslt/page2xhtml-xhtml.xsl">
+ <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
+ <map:parameter name="url" value="{5}"/>
+ <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-type" value="{page-envelope:document-type}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ </map:transform>
+ </map:otherwise>
+ </map:select>
+
<map:transform type="i18n">
<map:parameter name="locale" value="{page-envelope:document-language}"/>
</map:transform>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r278744 - /lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
Posted by Andreas Hartmann <an...@apache.org>.
Felix Röthenbacher wrote:
[...]
>> + + <map:select type="resource-exists">
>> + <map:when test="xslt/page2xhtml-{4}.xsl">
>> + <map:transform src="fallback://xslt/page2xhtml-{4}.xsl">
>
>
> Why use fallback here, as the resource has to exists? Or to ask the
> other way round: It seems that the fallback mechanism does not come
> into play here. Is that right or am I misunderstanding something?
You're right, fallback is useless here.
To make it work, we would need something like
<map:select type="resource-exists-fallback">
which checks if the source exists anywhere.
-- Andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r278744 - /lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
Posted by Felix Röthenbacher <fe...@wyona.com>.
Hi Andreas
I stumbled over commit of you I may not understand completely.
andreas@apache.org wrote:
> Author: andreas
> Date: Mon Sep 5 07:20:13 2005
> New Revision: 278744
>
> URL: http://svn.apache.org/viewcvs?rev=278744&view=rev
> Log:
> Default Pub: Allow resource types without custom XSLT
>
> Modified:
> lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
>
> Modified: lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap
> URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap?rev=278744&r1=278743&r2=278744&view=diff
> ==============================================================================
> --- lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap (original)
> +++ lenya/trunk/src/webapp/lenya/pubs/default/sitemap.xmap Mon Sep 5 07:20:13 2005
> @@ -117,13 +117,28 @@
> <map:part src="cocoon://modules/sitetree/{2}/{3}/search/{5}.xml"/>
> <map:part src="cocoon://modules/{page-envelope:document-type}/{1}.xml"/>
> </map:aggregate>
> - <map:transform src="fallback://xslt/page2xhtml-{4}.xsl">
> - <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
> - <map:parameter name="url" value="{5}"/>
> - <map:parameter name="document-id" value="{page-envelope:document-id}"/>
> - <map:parameter name="document-type" value="{page-envelope:document-type}"/>
> - <map:parameter name="language" value="{page-envelope:document-language}"/>
> - </map:transform>
> +
> + <map:select type="resource-exists">
> + <map:when test="xslt/page2xhtml-{4}.xsl">
> + <map:transform src="fallback://xslt/page2xhtml-{4}.xsl">
Why use fallback here, as the resource has to exists? Or to ask the
other way round: It seems that the fallback mechanism does not come
into play here. Is that right or am I misunderstanding something?
- Felix
> + <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
> + <map:parameter name="url" value="{5}"/>
> + <map:parameter name="document-id" value="{page-envelope:document-id}"/>
> + <map:parameter name="document-type" value="{page-envelope:document-type}"/>
> + <map:parameter name="language" value="{page-envelope:document-language}"/>
> + </map:transform>
> + </map:when>
> + <map:otherwise>
> + <map:transform src="xslt/page2xhtml-xhtml.xsl">
> + <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
> + <map:parameter name="url" value="{5}"/>
> + <map:parameter name="document-id" value="{page-envelope:document-id}"/>
> + <map:parameter name="document-type" value="{page-envelope:document-type}"/>
> + <map:parameter name="language" value="{page-envelope:document-language}"/>
> + </map:transform>
> + </map:otherwise>
> + </map:select>
> +
> <map:transform type="i18n">
> <map:parameter name="locale" value="{page-envelope:document-language}"/>
> </map:transform>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
> For additional commands, e-mail: commits-help@lenya.apache.org
>
>
--
Felix Röthenbacher felix.roethenbacher@wyona.com
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org