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 2005/02/14 11:19:09 UTC
svn commit: r153761 -
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Author: andreas
Date: Mon Feb 14 02:19:08 2005
New Revision: 153761
URL: http://svn.apache.org/viewcvs?view=rev&rev=153761
Log:
isDocument = false for admin area
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?view=diff&r1=153760&r2=153761
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java Mon Feb 14 02:19:08 2005
@@ -30,7 +30,7 @@
* Non-public constructor.
*/
public DefaultDocumentBuilder() {
- // do nothing
+ // do nothing
}
/**
@@ -72,8 +72,8 @@
}
/**
- * Creates a new document object. Override this method to create specific document objects,
- * e.g., for different document IDs.
+ * Creates a new document object. Override this method to create specific
+ * document objects, e.g., for different document IDs.
* @param map The identity map.
* @param area The area.
* @param documentId The document ID.
@@ -88,8 +88,8 @@
}
/**
- * Removes all "."-separated extensions from a URL (e.g., <code>/foo.print.html</code> is
- * transformed to <code>/foo</code>).
+ * Removes all "."-separated extensions from a URL (e.g.,
+ * <code>/foo.print.html</code> is transformed to <code>/foo</code>).
* @param url The URL to trim.
* @return A URL string.
*/
@@ -110,7 +110,7 @@
String language = "";
String url = urlWithoutSuffix;
-
+
int languageSeparatorIndex = url.lastIndexOf("_");
if (languageSeparatorIndex > -1) {
String suffix = url.substring(languageSeparatorIndex + 1);
@@ -152,7 +152,8 @@
if (slashIndex > -1) {
String area = publicationURI.substring(0, slashIndex);
String documentUri = publicationURI.substring(slashIndex);
- if (AbstractPublication.isValidArea(area) && documentUri.startsWith("/")) {
+ if (AbstractPublication.isValidArea(area) && !area.equals(Publication.ADMIN_AREA)
+ && documentUri.startsWith("/") && documentUri.length() > 1) {
isDocument = true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org