You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/09/12 18:15:36 UTC
svn commit: r442631 - in /lenya/trunk/src/pubs/default: sitemap.xmap
xslt/page2xhtml.xsl
Author: andreas
Date: Tue Sep 12 09:15:31 2006
New Revision: 442631
URL: http://svn.apache.org/viewvc?view=rev&rev=442631
Log:
Use document-path instead of document-id for neutron URL. This fixes bug 40484.
Modified:
lenya/trunk/src/pubs/default/sitemap.xmap
lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl
Modified: lenya/trunk/src/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/sitemap.xmap?view=diff&rev=442631&r1=442630&r2=442631
==============================================================================
--- lenya/trunk/src/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/sitemap.xmap Tue Sep 12 09:15:31 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: sitemap.xmap 439259 2006-09-01 10:06:39Z andreas $ -->
+<!-- $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
@@ -157,7 +157,7 @@
<map:parameter name="publication-id" value="{2}"/>
<map:parameter name="area" value="{3}"/>
<map:parameter name="url" value="{5}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-path" value="{page-envelope:document-path}"/>
<map:parameter name="document-type" value="{page-envelope:document-type}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
@@ -174,7 +174,7 @@
<map:parameter name="publication-id" value="{2}"/>
<map:parameter name="area" value="{3}"/>
<map:parameter name="url" value="{5}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-path" value="{page-envelope:document-path}"/>
<map:parameter name="document-type" value="{page-envelope:document-type}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
@@ -283,7 +283,7 @@
</map:transform>
<map:transform src="fallback://lenya/xslt/authoring/edit/removeSourceTags.xsl"/>
<map:act type="set-header">
- <map:parameter name="Expires" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-id}:{page-envelope:document-language}:expires}"/>
+ <map:parameter name="Expires" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-uuid}:{page-envelope:document-language}:expires}"/>
</map:act>
</map:when>
<!-- Turn off caching in authoring area -->
@@ -317,12 +317,12 @@
<map:match pattern="*/**.*">
<!-- TODO: http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=112496255207733&w=2 -->
<map:match type="regexp" pattern="(.*\.)(pdf|PDF|Pdf)$">
- <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}" mime-type="application/pdf">
- <map:parameter name="byte-ranges" value="false"/>
- </map:read>
+ <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}" mime-type="application/pdf">
+ <map:parameter name="byte-ranges" value="false"/>
+ </map:read>
</map:match>
<map:act type="language-exists">
- <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}"/>
+ <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}"/>
</map:act>
<map:generate type="serverpages" src="fallback://lenya/content/exception/document-does-not-exist.xsp"/>
Modified: lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl?view=diff&rev=442631&r1=442630&r2=442631
==============================================================================
--- lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl (original)
+++ lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl Tue Sep 12 09:15:31 2006
@@ -35,7 +35,7 @@
<!-- i.e. doctypes/xhtml-document -->
<xsl:param name="document-type"/>
- <xsl:param name="document-id"/>
+ <xsl:param name="document-path"/>
<!-- The request url i.e. /lenya/doctypes/xhtml-document_en.html -->
<xsl:param name="url"/>
@@ -51,7 +51,7 @@
<xsl:template match="cmsbody">
<html>
<head>
- <link rel="neutron-introspection" type="application/neutron+xml" href="{$root}{$document-id}/introspection.xml"/>
+ <link rel="neutron-introspection" type="application/neutron+xml" href="{$root}{$document-path}/introspection.xml"/>
<link rel="stylesheet" href="{$root}/css/page.css" type="text/css"/>
<!-- Load doctype-specific CSS -->
<xsl:choose>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org