Author: chestnut
Date: Fri Jan 27 13:17:12 2006
New Revision: 372987
URL: http://svn.apache.org/viewcvs?rev=372987&view=rev
Log:
the svg module needs to handle shared images if they are processed
(image2svg.xsl)
Modified:
lenya/trunk/src/modules/svg/sitemap.xmap
Modified: lenya/trunk/src/modules/svg/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/svg/sitemap.xmap?rev=372987&r1=372986&r2=372987&view=diff
==============================================================================
--- lenya/trunk/src/modules/svg/sitemap.xmap (original)
+++ lenya/trunk/src/modules/svg/sitemap.xmap Fri Jan 27 13:17:12 2006
@@ -24,36 +24,84 @@
<map:match type="regexp"
pattern="(.*\.)(jpg|JPG|Jpg|jpeg|Jpeg|JPEG)$">
<map:generate src="dummy.xml"/>
- <map:transform src="xslt/scale.xsl">
- <map:parameter name="url"
value="context://lenya/pubs/{../1}/resources/{../2}/{../3}.{../4}"/>
- <map:parameter name="width" value="{request-param:width}"/>
- <map:parameter name="height" value="{request-param:height}"/>
- </map:transform>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/{../2}/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/{../../2}/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/shared/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/shared/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
<map:serialize type="svg2jpeg"/>
</map:match>
<map:match type="regexp" pattern="(.*\.)(png|PNG|Png)$">
<map:generate src="dummy.xml"/>
- <map:transform src="xslt/scale.xsl">
- <map:parameter name="url"
value="context://lenya/pubs/{../1}/resources/{../2}/{../3}.{../4}"/>
- <map:parameter name="width" value="{request-param:width}"/>
- <map:parameter name="height" value="{request-param:height}"/>
- </map:transform>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/{../2}/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/{../../2}/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/shared/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/shared/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
<map:serialize type="svg2png"/>
</map:match>
<map:match type="regexp" pattern="(.*\.)(tif|TIF|Tif)$">
<map:generate src="dummy.xml"/>
- <map:transform src="xslt/scale.xsl">
- <map:parameter name="url"
value="context://lenya/pubs/{../1}/resources/{../2}/{../3}.{../4}"/>
- <map:parameter name="width" value="{request-param:width}"/>
- <map:parameter name="height" value="{request-param:height}"/>
- </map:transform>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/{../2}/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/{../../2}/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/shared/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:transform src="xslt/scale.xsl">
+ <map:parameter name="url"
value="fallback://resources/shared/{../../3}.{../../4}"/>
+ <map:parameter name="width" value="{request-param:width}"/>
+ <map:parameter name="height" value="{request-param:height}"/>
+ </map:transform>
+ </map:act>
<map:serialize type="svg2tiff"/>
</map:match>
<map:match type="regexp" pattern="(.*\.)(gif|GIF|Gif)$">
- <map:read
src="fallback://lenya/pubs/{../1}/resources/{../2}/{../3}.{../4}"
mime-type="image/gif" />
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/{../2}/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:read src="fallback://resources/{../../2}/{../../3}.{../../4}"
mime-type="image/gif" />
+ </map:act>
+ <map:act type="resource-exists-enhanced">
+ <map:parameter name="url"
value="fallback://resources/shared/{../3}.{../4}"/>
+ <map:parameter name="type" value="file"/>
+ <map:read src="fallback://resources/shared/{../../3}.{../../4}"
mime-type="image/gif" />
+ </map:act>
</map:match>
</map:match>
|
