r46725 - openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite

[andre]

Author: andre
Date: 2015-08-04 15:48:39 +0200 (Tue, 04 Aug 2015)
New Revision: 46725

Modified:
openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/ArticlesUrlConverter.java
openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/SiteUrlConverter.java
Log:
remove . as well

Modified: openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/ArticlesUrlConverter.java
===================================================================
--- openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/ArticlesUrlConverter.java 2015-08-04 12:42:46 UTC (rev 46724)
+++ openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/ArticlesUrlConverter.java 2015-08-04 13:48:39 UTC (rev 46725)
@@ -21,22 +21,27 @@

package org.mmbase.mmsite;

-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-
-import org.mmbase.util.transformers.CharTransformer;
-import org.mmbase.util.transformers.Identifier;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.Query;
import org.mmbase.bridge.util.Queries;
import org.mmbase.framework.*;
+import org.mmbase.framework.basic.BasicFramework;
+import org.mmbase.framework.basic.BasicUrl;
import org.mmbase.framework.basic.DirectoryUrlConverter;
-import org.mmbase.framework.basic.BasicFramework;
import org.mmbase.framework.basic.Url;
-import org.mmbase.framework.basic.BasicUrl;
-import org.mmbase.util.functions.*;
-import org.mmbase.util.logging.*;
-import org.mmbase.mmsite.LocaleUtil;
+import org.mmbase.util.functions.Parameter;
+import org.mmbase.util.functions.Parameters;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+import org.mmbase.util.transformers.CharTransformer;
+import org.mmbase.util.transformers.Identifier;

+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
/**
* UrlConverter that can filter and create urls for articles, f.e. '/articles/2345/article_title'
* This UrlConverter works on the second last piece of the path, the nodenumber. The last part of
@@ -195,7 +200,7 @@
String last = path.get(path.size() - 1);
last = localeUtil.setLanguage(last, request);
if (SiteUrlConverter.getInstance().useExtension && last.indexOf(SiteUrlConverter.getInstance().extension) > -1) {
- last = last.substring(0, last.lastIndexOf(SiteUrlConverter.getInstance().extension));
+ last = last.substring(0, last.lastIndexOf(SiteUrlConverter.getInstance().extension) - 1);
}
path.set(path.size() - 1, last); // put it back


Modified: openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/SiteUrlConverter.java
===================================================================
--- openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/SiteUrlConverter.java 2015-08-04 12:42:46 UTC (rev 46724)
+++ openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/SiteUrlConverter.java 2015-08-04 13:48:39 UTC (rev 46725)
@@ -21,17 +21,26 @@

package org.mmbase.mmsite;

-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.ContextProvider;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NotFoundException;
import org.mmbase.framework.*;
+import org.mmbase.framework.basic.BasicFramework;
+import org.mmbase.framework.basic.BasicUrl;
import org.mmbase.framework.basic.DirectoryUrlConverter;
-import org.mmbase.framework.basic.BasicFramework;
import org.mmbase.framework.basic.Url;
-import org.mmbase.framework.basic.BasicUrl;
-import org.mmbase.util.functions.*;
-import org.mmbase.util.logging.*;
+import org.mmbase.util.functions.Parameter;
+import org.mmbase.util.functions.Parameters;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;

+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
/**
* The UrlConverter that can filter and create urls for pages in the site application.
* It can be used as a '/' (root) UrlConverter. Use 'excludedPaths' to list directories to
@@ -202,7 +211,7 @@
}

if (useExtension && path.indexOf(extension) > -1) {
- path = path.substring(0, path.lastIndexOf(extension));
+ path = path.substring(0, path.lastIndexOf(extension) - 1);
}

Node node = UrlUtils.getPagebyPath(request, cloud, cloud.getNodeManager("pages"), path);