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 2007/04/17 15:00:56 UTC
svn commit: r529587 -
/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java
Author: andreas
Date: Tue Apr 17 06:00:55 2007
New Revision: 529587
URL: http://svn.apache.org/viewvc?view=rev&rev=529587
Log:
Rewrite only authoring URLs so that pub/modules/... etc. are not affected
Modified:
lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java
Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java?view=diff&rev=529587&r1=529586&r2=529587
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java Tue Apr 17 06:00:55 2007
@@ -76,8 +76,8 @@
* </ul>
*
* <p>
- * You can add the query parameter <code>uuid2url.extension</code> to <code>lenya-document:</code>
- * URLs to set a specific link extension.
+ * You can add the query parameter <code>uuid2url.extension</code> to
+ * <code>lenya-document:</code> URLs to set a specific link extension.
* </p>
*
* $Id: LinkRewritingTransformer.java,v 1.7 2004/03/16 11:12:16 gregor
@@ -226,9 +226,9 @@
LinkTarget target = this.linkResolver.resolve(doc, linkUri);
if (target.exists() && target.getDocument().hasLink()) {
Document targetDocument = target.getDocument();
-
+
String extension = getExtension(targetDocument, requiredExtension);
-
+
rewriteLink(newAttrs, attributeNames[i], targetDocument, anchor,
queryString, extension);
} else if (doc.getArea().equals(Publication.AUTHORING_AREA)) {
@@ -249,10 +249,14 @@
if (linkUrl.startsWith(prefix)) {
String pubUrl = linkUrl.substring(prefix.length());
String area = pubUrl.split("/")[0];
- String areaUrl = pubUrl.substring(area.length());
- String newUrl = this.contextPath + prefix
- + this.currentDocument.getArea() + areaUrl;
- setAttribute(newAttrs, attributeNames[i], newUrl);
+
+ // don't rewrite /{pub}/modules/...
+ if (area.equals(Publication.AUTHORING_AREA)) {
+ String areaUrl = pubUrl.substring(area.length());
+ String newUrl = this.contextPath + prefix
+ + this.currentDocument.getArea() + areaUrl;
+ setAttribute(newAttrs, attributeNames[i], newUrl);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org