X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;h=facb5933bf3ebe743ce99eeed8e57c300d0cb11b;hb=8afcdd215960582369e8f7d1d1f47b42d80b3fa6;hp=cfd90f93c1d5e77aa86e900985646095204adf4c;hpb=369abbec35158f11bcca3651c1c3f2f7d6652226;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
index cfd90f93c..facb5933b 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -1,10 +1,13 @@
 package org.argeo.cms.acr;
 
 import java.io.PrintStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
+import java.util.StringTokenizer;
 import java.util.function.BiConsumer;
 
 import javax.security.auth.login.LoginContext;
@@ -16,6 +19,8 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.DName;
 import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.directory.CmsDirectory;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
@@ -67,7 +72,6 @@ public class ContentUtils {
 
 	public static final char SLASH = '/';
 	public static final String SLASH_STRING = Character.toString(SLASH);
-	public static final String ROOT_SLASH = "" + SLASH;
 	public static final String EMPTY = "";
 
 	/**
@@ -103,7 +107,7 @@ public class ContentUtils {
 
 	public static List<String> toPathSegments(String path) {
 		List<String> res = new ArrayList<>();
-		if (EMPTY.equals(path) || ROOT_SLASH.equals(path))
+		if (EMPTY.equals(path) || Content.ROOT_PATH.equals(path))
 			return res;
 		collectPathSegments(path, res);
 		return res;
@@ -124,6 +128,16 @@ public class ContentUtils {
 			throw new IllegalArgumentException("Path " + path + " contains //");
 	}
 
+	/** The last element of a path. */
+	public static String lastPathElement(String path) {
+		if (path.charAt(path.length() - 1) == '/')
+			throw new IllegalArgumentException("Path " + path + " cannot end with '/'");
+		int index = path.lastIndexOf('/');
+		if (index < 0)
+			return path;
+		return path.substring(index + 1);
+	}
+
 	/*
 	 * DIRECTORY
 	 */
@@ -177,7 +191,7 @@ public class ContentUtils {
 		}
 	}
 
-	public static ContentSession openDataAdminSession(ContentRepository repository) {
+	public static ContentSession openDataAdminSession(ContentRepository contentRepository) {
 		LoginContext loginContext;
 		try {
 			loginContext = CmsAuth.DATA_ADMIN.newLoginContext();
@@ -190,12 +204,16 @@ public class ContentUtils {
 		ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
 		try {
 			Thread.currentThread().setContextClassLoader(ContentUtils.class.getClassLoader());
-			return CurrentSubject.callAs(loginContext.getSubject(), () -> repository.get());
+			return CurrentSubject.callAs(loginContext.getSubject(), () -> contentRepository.get());
 		} finally {
 			Thread.currentThread().setContextClassLoader(currentCl);
 		}
 	}
 
+	public static ContentSession openSession(ContentRepository contentRepository, CmsSession cmsSession) {
+		return CurrentSubject.callAs(cmsSession.getSubject(), () -> contentRepository.get());
+	}
+
 	/**
 	 * Constructs a relative path between a base path and a given path.
 	 * 
@@ -213,6 +231,33 @@ public class ContentUtils {
 		return relativePath;
 	}
 
+	/** A path in the node repository */
+	public static String getDataPath(Content node) {
+		// TODO make it more configurable?
+		StringBuilder buf = new StringBuilder(CmsConstants.PATH_API_ACR);
+		buf.append(node.getPath());
+		return buf.toString();
+	}
+
+	/** A path in the node repository */
+	public static String getDataPathForUrl(Content node) {
+		return cleanPathForUrl(getDataPath(node));
+	}
+
+	/** Clean reserved URL characters for use in HTTP links. */
+	public static String cleanPathForUrl(String path) {
+		StringTokenizer st = new StringTokenizer(path, "/");
+		StringBuilder sb = new StringBuilder();
+		while (st.hasMoreElements()) {
+			sb.append('/');
+			String encoded = URLEncoder.encode(st.nextToken(), StandardCharsets.UTF_8);
+			encoded = encoded.replace("+", "%20");
+			sb.append(encoded);
+
+		}
+		return sb.toString();
+	}
+
 	/** Singleton. */
 	private ContentUtils() {