svn commit: r569342 - in /lenya/trunk/src/modules/svg: sitemap.xmap xslt/scale.xsl

Author: andreas
Date: Fri Aug 24 03:48:00 2007
New Revision: 569342

URL: http://svn.apache.org/viewvc?rev=569342&view=rev
Log:
Added revision handling to SVG image resizing.

Modified:
    lenya/trunk/src/modules/svg/sitemap.xmap
    lenya/trunk/src/modules/svg/xslt/scale.xsl

Modified: lenya/trunk/src/modules/svg/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/svg/sitemap.xmap?rev=569342&r1=569341&r2=569342&view=diff
==============================================================================
--- lenya/trunk/src/modules/svg/sitemap.xmap (original)
+++ lenya/trunk/src/modules/svg/sitemap.xmap Fri Aug 24 03:48:00 2007
@@ -59,7 +59,11 @@
       <map:match pattern="*-*-*-*-*.png">
         <map:generate src="cocoon:/shape/{1}-{2}-{3}-{4}-{5}.svg"/>
         <map:serialize type="svg2png"/>
-      </map:match>
+      </map:match>
+      
+    </map:pipeline>
+    
+    <map:pipeline type="noncaching">
       
       <!--
         image resizing pipelines
@@ -88,7 +92,8 @@
           <map:parameter name="url" value="site://{1}/{2}/{page-envelope:default-language}/{3}"/>
           <map:transform src="xslt/scale.xsl">
             <map:parameter name="nonProxyBaseUrl" value="http://localhost:{request:serverPort}{request:contextPath}"/>
-            <map:parameter name="url" value="{proxy:/{../1}/{../2}/{../3}.{../4}}"/>
+            <map:parameter name="url" value="{proxy:/{../1}/{../2}/{../3}.{../4}}"/>
+            <map:parameter name="revision" value="{request-param:lenya.revision}"/>
             <map:parameter name="width" value="{request-param:width}"/>
             <map:parameter name="height" value="{request-param:height}"/>
           </map:transform>
@@ -98,6 +103,7 @@
           <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="revision" value="{request-param:lenya.revision}"/>
             <map:parameter name="width" value="{request-param:width}"/>
             <map:parameter name="height" value="{request-param:height}"/>
           </map:transform>

Modified: lenya/trunk/src/modules/svg/xslt/scale.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/svg/xslt/scale.xsl?rev=569342&r1=569341&r2=569342&view=diff
==============================================================================
--- lenya/trunk/src/modules/svg/xslt/scale.xsl (original)
+++ lenya/trunk/src/modules/svg/xslt/scale.xsl Fri Aug 24 03:48:00 2007
@@ -24,6 +24,7 @@
   <xsl:param name="nonProxyBaseUrl"/>
   <xsl:param name="height"/>
   <xsl:param name="width"/>
+  <xsl:param name="revision"/>
   
   <!-- Workaround: Batik doesn't seem to like SSL URLs -->
   <xsl:param name="imageUrl">
@@ -38,6 +39,7 @@
         <xsl:value-of select="$url"/>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="$revision != ''">?lenya.revision=<xsl:value-of select="$revision"/></xsl:if>
   </xsl:param>
   
   <xsl:template match="/">