svn commit: r667058 - in /lenya/trunk/src: modules/links/sitemap.xmap pubs/default/modules/homepage/sitemap.xmap

Author: andreas
Date: Thu Jun 12 05:19:03 2008
New Revision: 667058

URL: http://svn.apache.org/viewvc?rev=667058&view=rev
Log:
Adding parameterized matches to links and homepage module sitemaps.

Modified:
    lenya/trunk/src/modules/links/sitemap.xmap
    lenya/trunk/src/pubs/default/modules/homepage/sitemap.xmap

Modified: lenya/trunk/src/modules/links/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/links/sitemap.xmap?rev=667058&r1=667057&r2=667058&view=diff
==============================================================================
--- lenya/trunk/src/modules/links/sitemap.xmap (original)
+++ lenya/trunk/src/modules/links/sitemap.xmap Thu Jun 12 05:19:03 2008
@@ -25,9 +25,15 @@
     <map:pipeline>
 
       <!-- parametrized doctype matcher -->
-      <!-- pattern="{rendertype}" -->
+      <!-- pattern="{format}.xml" -->
       <map:match pattern="*.xml">
-        <map:generate src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
+        <map:generate src="cocoon:/{1}.xml/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-uuid}/{page-envelope:document-language}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      
+      <!-- {format}.xml/{pubId}/{area}/{uuid}/{language} -->
+      <map:match pattern="*.xml/*/*/*/*">
+        <map:generate src="lenya-document:{4},pub={2},area={3},lang={5}{link:rev}"/>
         <map:transform src="fallback://lenya/modules/links/xslt/links2xhtml.xsl">
           <map:parameter name="rendertype" value="{request-param:rendertype}"/>
           <map:parameter name="nodeid" value="{page-envelope:document-name}"/>

Modified: lenya/trunk/src/pubs/default/modules/homepage/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/sitemap.xmap?rev=667058&r1=667057&r2=667058&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/modules/homepage/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/modules/homepage/sitemap.xmap Thu Jun 12 05:19:03 2008
@@ -51,9 +51,15 @@
       </map:match>
 
       <!-- parametrized doctype matcher -->
-      <!-- pattern="{rendertype}" -->
+      <!-- pattern="{format}.xml" -->
       <map:match pattern="*.xml">
-        <map:generate src="lenya-document:{page-envelope:document-uuid},lang={page-envelope:document-language}{link:rev}"/>
+        <map:generate src="cocoon:/{1}.xml/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-uuid}/{page-envelope:document-language}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      
+      <!-- {format}.xml/{pubId}/{area}/{uuid}/{language} -->
+      <map:match pattern="*.xml/*/*/*/*">
+        <map:generate src="lenya-document:{4},pub={2},area={3},lang={5}{link:rev}"/>
         <map:transform src="fallback://lenya/modules/homepage/xslt/homepage2xhtml.xsl">
           <map:parameter name="rendertype" value="{request-param:rendertype}"/>
           <map:parameter name="nodeid" value="{page-envelope:document-name}"/>