svn commit: r1430335 - /lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap

Author: andreas
Date: Tue Jan  8 15:45:45 2013
New Revision: 1430335

URL: http://svn.apache.org/viewvc?rev=1430335&view=rev
Log:
Use media type instead of source extension to serve resource documents.

Modified:
    lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap

Modified: lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap?rev=1430335&r1=1430334&r2=1430335&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap (original)
+++ lenya/contributions/2_0_X/modules/defaultstyle/sitemap.xmap Tue Jan  8 15:45:45 2013
@@ -204,19 +204,19 @@
         
         <!--
           For non-html documents:
-          If the requested extension equals the source extension, deliver the document directly.
+          If the Accept header matches the media type, deliver the document directly.
         -->
-        <map:match pattern="*/**.*">
-          <map:act type="language-exists">
-            <map:select type="parameter">
-              <map:parameter name="parameter-selector-test" value="{page-envelope:document-extension}"/>
-              <map:when test="html"/>
-              <map:when test="{../3}">
-                <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
-              </map:when>
-            </map:select>
-          </map:act>
-        </map:match>
+        <map:act type="language-exists">
+          <map:select type="media-type">
+            <!-- Skip XHTML documents -->
+            <map:when test="application/xhtml+xml"/>
+            <!-- Serve matching resource documents -->
+            <map:when test="{page-envelope:document-mime-type}">
+              <map:read src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
+            </map:when>
+            <!-- Ignore non-matching requests -->
+          </map:select>
+        </map:act>
         
         <map:generate src="cocoon:/{1}/{2}.pageContextInternal"/>
         <map:transform src="xslt/includeDocument.xsl">