Update of /var/cvs/speeltuin/andre/mmsite/src/org/mmbase/mmsite
In directory james.mmbase.org:/tmp/cvs-serv11652
Modified Files:
SiteUrlConverter.java
Log Message:
check on excludepaths earlier
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/andre/mmsite/src/org/mmbase/mmsite
Index: SiteUrlConverter.java
===================================================================
RCS file:
/var/cvs/speeltuin/andre/mmsite/src/org/mmbase/mmsite/SiteUrlConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SiteUrlConverter.java 20 Apr 2009 11:49:34 -0000 1.4
+++ SiteUrlConverter.java 23 Apr 2009 12:12:36 -0000 1.5
@@ -31,7 +31,7 @@
* </urlconverter>
*
* @author André van Toly
- * @version $Id: SiteUrlConverter.java,v 1.4 2009/04/20 11:49:34 andre Exp $
+ * @version $Id: SiteUrlConverter.java,v 1.5 2009/04/23 12:12:36 andre Exp $
* @since MMBase-1.9
*/
public class SiteUrlConverter extends DirectoryUrlConverter {
@@ -70,8 +70,8 @@
*/
@Override protected void getNiceDirectoryUrl(StringBuilder b, Block block,
Parameters parameters, Parameters frameworkParameters, boolean action) throws
FrameworkException {
if (log.isDebugEnabled()) {
- if (log.isDebugEnabled()) log.debug("" + parameters +
frameworkParameters);
- if (log.isDebugEnabled()) log.debug("Found 'page' block: " +
block);
+ log.debug("" + parameters + frameworkParameters);
+ log.debug("Found 'page' block: " + block);
}
int b_len = b.length();
@@ -99,6 +99,11 @@
Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase");
if (log.isDebugEnabled()) log.debug("path pieces: " + pa + ",
path size: " + pa.size());
+ if (excludedPaths.contains(pa.get(0))) {
+ if (log.isDebugEnabled()) log.debug("Returning null,
path in excludepaths: " + pa.get(0));
+ return Url.NOT;
+ }
+
StringBuilder sb = new StringBuilder();
for (String piece: pa) {
sb.append("/").append(piece);
@@ -112,13 +117,6 @@
//pa.set(pa.size() - 1, id);
}
-
- if (excludedPaths.contains(pa.get(0))) {
- if (log.isDebugEnabled()) log.debug("Returning null,
path in excludepaths: " + path);
- return Url.NOT;
-
- } else {
- // find the node with this path
Node node = UrlUtils.getPagebyPath(cloud, path);
if (node != null) {
String template =
node.getNodeValue("template").getStringValue("url");
@@ -131,7 +129,6 @@
if (log.isDebugEnabled()) log.debug("Returning: " +
result.toString());
return new BasicUrl(this, result.toString());
- }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
