You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2005/12/22 20:49:39 UTC

svn commit: r358610 - /lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap

Author: chestnut
Date: Thu Dec 22 11:49:37 2005
New Revision: 358610

URL: http://svn.apache.org/viewcvs?rev=358610&view=rev
Log:
use page-envelope to get lang version instead of trying to match it

Modified:
    lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap

Modified: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap?rev=358610&r1=358609&r2=358610&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap Thu Dec 22 11:49:37 2005
@@ -144,14 +144,6 @@
       <map:match pattern="GET/**">
         <map:act type="set-header">
           <map:parameter name="Last-Modified" value="{page-envelope:document-lastmodified}" />
-          <map:match pattern="GET/*_*.html">
-            <map:generate src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{2}.xml"/>
-            <map:serialize type="xml-get"/>
-          </map:match>
-          <map:match pattern="GET/**/*_*.html">
-            <map:generate src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/{2}/index_{3}.xml"/>
-            <map:serialize type="xml-get"/>
-          </map:match>
           <map:match pattern="GET/**.html">
             <map:generate src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{page-envelope:document-language}.xml"/>
             <map:serialize type="xml-get"/>
@@ -160,15 +152,8 @@
       </map:match>
 
       <map:match pattern="PROPFIND/**.html">
-        <map:match pattern="PROPFIND/*_*.html">
-          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{2}.xml">
-            <map:call function="filePropfind" >
-              <map:parameter name="last-modified" value="{page-envelope:document-lastmodified}"/>
-            </map:call>
-          </map:act>
-        </map:match>
-        <map:match pattern="PROPFIND/**/*_*.html">
-          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/{2}/index_{3}.xml">
+        <map:match pattern="PROPFIND/**.html">
+          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{page-envelope:document-language}.xml">
             <map:call function="filePropfind" >
               <map:parameter name="last-modified" value="{page-envelope:document-lastmodified}"/>
             </map:call>
@@ -190,16 +175,8 @@
       </map:match>
 
       <map:match pattern="HEAD/**.html">
-        <map:match pattern="HEAD/*_*.html">
-          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{2}.xml">
-            <map:act type="set-header">
-              <map:parameter name="Last-Modified" value="{page-envelope:document-lastmodified}" />
-              <map:call function="filePropfind" />
-            </map:act>
-          </map:act>
-        </map:match>
-        <map:match pattern="HEAD/**/*_*.html">
-          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/{2}/index_{3}.xml">
+        <map:match pattern="HEAD/**.html">
+          <map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}/index_{page-envelope:document-language}.xml">
             <map:act type="set-header">
               <map:parameter name="Last-Modified" value="{page-envelope:document-lastmodified}" />
               <map:call function="filePropfind" />



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org