encoding and decoding of slash with %2f slightly improved

wyona · Feb 2, 2012 · 9eb0801 · 9eb0801
1 parent 07a3ebf
commit 9eb0801
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.../resources/show-realms/src/java/org/wyona/yanel/impl/resources/showrealms/ShowRealms.java b/.../resources/show-realms/src/java/org/wyona/yanel/impl/resources/showrealms/ShowRealms.java
@@ -127,12 +127,21 @@ private StringBuilder getXML() {
         for (int i = 0; i < rtds.length; i++) {
             sb.append("<resourcetype>");
             try {
-                String rtYanelHtdocPath = PathUtil.getGlobalHtdocsPath(this) + "resource-types/" + rtds[i].getResourceTypeNamespace().replaceAll("/", "%2f").replaceAll(":", "%3a") + "%3a%3a" + rtds[i].getResourceTypeLocalName() + "/" + yanel.getReservedPrefix() + "/";
-                // TODO: Use utility class
-                //String rtYanelHtdocPath = PathUtil.getResourcesHtdocsPathURLencoded(ResourceManager.getResource(rtds[i])) + yanel.getReservedPrefix() + "/";
                 sb.append("<localname>" + rtds[i].getResourceTypeLocalName() + "</localname>");
                 sb.append("<namespace>" + rtds[i].getResourceTypeNamespace() + "</namespace>");
                 sb.append("<description>" + rtds[i].getResourceTypeDescription() + "</description>");
+
+
+                StringBuilder rtYanelHtdocPath = new StringBuilder(PathUtil.getGlobalHtdocsPath(this) + "resource-types/");
+                rtYanelHtdocPath.append(rtds[i].getResourceTypeNamespace().replaceAll("/", "%2f").replaceAll(":", "%3a") + "%3a%3a" + rtds[i].getResourceTypeLocalName());
+                rtYanelHtdocPath.append("/" + yanel.getReservedPrefix() + "/");
+                //log.debug("Encoded resource path: " + rtYanelHtdocPath);
+/*
+                // TODO: Use utility class
+                String rtYanelHtdocPath = PathUtil.getResourcesHtdocsPathURLencoded(getYanel().getResourceManager().getResource(rtds[i]));
+                rtYanelHtdocPath = rtYanelHtdocPath + "/" + yanel.getReservedPrefix() + "/";
+*/
+
                 sb.append("<icon alt=\"" + rtds[i].getResourceTypeLocalName() + " resource-type\">" + rtYanelHtdocPath + "icons/32x32/rt-icon.png" + "</icon>");
                 sb.append("<docu>" + rtYanelHtdocPath + "doc/index.html" + "</docu>");
             } catch(Exception e) {

diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java b/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
@@ -1914,7 +1914,7 @@ private void getGlobalData(HttpServletRequest request, HttpServletResponse respo
         final String pathPrefix = "/" + reservedPrefix + "/";
         final String ABOUT_PAGE_PATH = pathPrefix + "about.html"; // About Yanel
         final String ABOUT_REALM_PAGE_PATH = pathPrefix + "about-realm.html"; // About realm
-        final String resourceTypesPathPrefix = pathPrefix + "resource-types/";
+        final String RESOURCE_TYPES_PATH_PREFIX = pathPrefix + "resource-types/";
 
         //XXX REFACTORME: in the cases where we simply use a resource-type's view
         // we should implement org.wyona.yanel.core.api.ResourceTypeMatcherV1 ( cf. http://lists.wyona.org/pipermail/yanel-development/2009-June/003749.html )
@@ -1950,14 +1950,15 @@ private void getGlobalData(HttpServletRequest request, HttpServletResponse respo
             PrintWriter w = response.getWriter();
             w.print(AboutRealm.toHTML(realm));
             return;
-        } else if (path.startsWith(resourceTypesPathPrefix)) {
-            final String[] namespaceURI_and_rest = path.substring(resourceTypesPathPrefix.length()).split("::", 2);
+        } else if (path.startsWith(RESOURCE_TYPES_PATH_PREFIX)) {
+            final String[] namespaceURI_and_rest = path.substring(RESOURCE_TYPES_PATH_PREFIX.length()).split("::", 2);
             final String namespaceURI = namespaceURI_and_rest[0];
             final String[] name_and_rest = namespaceURI_and_rest[1].split("/", 2);
             final String name = name_and_rest[0];
 
             // INFO: Decode URL, e.g. /yanel/resource-types/^http:^2f^2fwww.wyona.org^2fyanel^2fresource^2f1.0::user-admin/dummy.css
             final String decoded_namespaceURI = HttpServletRequestHelper.decodeURIinURLpath('^', namespaceURI);
+            log.debug("decoded_namespaceURI: " + decoded_namespaceURI);
             if (log.isDebugEnabled()) log.debug("decoded_namespaceURI: "+decoded_namespaceURI);
             // The request (see resource.getPath()) seems to replace 'http://' or 'http%3a%2f%2f' by 'http:/', so let's change this back
             final String namespace = ! decoded_namespaceURI.equals(namespaceURI) ? decoded_namespaceURI : namespaceURI.replaceAll("http:/", "http://");