X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;h=a6acb8a34bc9505e2c44badbbfe65b94941c2d5e;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=17144cfdb660cfceaf84c54016b46b6f44c1ac8e;hpb=c0342975a37c70895c2e8f6b341d790700168d7f;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 17144cfdb..a6acb8a34 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -13,11 +13,13 @@ import javax.xml.namespace.QName;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.DName;
 import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.cms.CmsUserManager;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
+import org.argeo.cms.util.CurrentSubject;
 import org.osgi.service.useradmin.Role;
 
 /** Utilities and routines around {@link Content}. */
@@ -63,7 +65,9 @@ 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 = "";
 
 	/**
 	 * Split a path (with '/' separator) in an array of length 2, the first part
@@ -83,7 +87,7 @@ public class ContentUtils {
 		}
 
 		if (parentIndex == -1) // no '/'
-			return new String[] { "", path };
+			return new String[] { EMPTY, path };
 
 		return new String[] { parentIndex != 0 ? path.substring(0, parentIndex) : "" + SLASH,
 				path.substring(parentIndex + 1) };
@@ -98,7 +102,7 @@ public class ContentUtils {
 
 	public static List<String> toPathSegments(String path) {
 		List<String> res = new ArrayList<>();
-		if ("".equals(path) || ROOT_SLASH.equals(path))
+		if (EMPTY.equals(path) || ROOT_SLASH.equals(path))
 			return res;
 		collectPathSegments(path, res);
 		return res;
@@ -106,10 +110,10 @@ public class ContentUtils {
 
 	private static void collectPathSegments(String path, List<String> segments) {
 		String[] parent = getParentPath(path);
-		if ("".equals(parent[1])) // root
+		if (EMPTY.equals(parent[1])) // root
 			return;
 		segments.add(0, parent[1]);
-		if ("".equals(parent[0])) // end
+		if (EMPTY.equals(parent[0])) // end
 			return;
 		collectPathSegments(parent[0], segments);
 	}
@@ -119,14 +123,39 @@ public class ContentUtils {
 			throw new IllegalArgumentException("Path " + path + " contains //");
 	}
 
+	/*
+	 * DIRECTORY
+	 */
+
 	public static Content roleToContent(CmsUserManager userManager, ContentSession contentSession, Role role) {
 		UserDirectory userDirectory = userManager.getDirectory(role);
-		String path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getName() + SLASH
-				+ userDirectory.getRolePath(role);
+		String path = directoryPath(userDirectory) + userDirectory.getRolePath(role);
+		Content content = contentSession.get(path);
+		return content;
+	}
+
+	public static Content hierarchyUnitToContent(ContentSession contentSession, HierarchyUnit hierarchyUnit) {
+		Directory directory = hierarchyUnit.getDirectory();
+		StringJoiner relativePath = new StringJoiner(SLASH_STRING);
+		buildHierarchyUnitPath(hierarchyUnit, relativePath);
+		String path = directoryPath(directory) + relativePath.toString();
 		Content content = contentSession.get(path);
 		return content;
 	}
 
+	/** The path to this {@link Directory}. Ends with a /. */
+	private static String directoryPath(Directory directory) {
+		return CmsContentRepository.DIRECTORY_BASE + SLASH + directory.getName() + SLASH;
+	}
+
+	/** Recursively build a relative path of a {@link HierarchyUnit}. */
+	private static void buildHierarchyUnitPath(HierarchyUnit current, StringJoiner relativePath) {
+		if (current.getParent() == null) // directory
+			return;
+		buildHierarchyUnitPath(current.getParent(), relativePath);
+		relativePath.add(current.getHierarchyUnitName());
+	}
+
 	/*
 	 * CONSUMER UTILS
 	 */
@@ -134,7 +163,7 @@ public class ContentUtils {
 	public static Content createCollections(ContentSession session, String path) {
 		if (session.exists(path)) {
 			Content content = session.get(path);
-			if (!content.isContentClass(CrName.collection.qName())) {
+			if (!content.isContentClass(DName.collection.qName())) {
 				throw new IllegalStateException("Content " + path + " already exists, but is not a collection");
 			} else {
 				return content;
@@ -142,7 +171,7 @@ public class ContentUtils {
 		} else {
 			String[] parentPath = getParentPath(path);
 			Content parent = createCollections(session, parentPath[0]);
-			Content content = parent.add(parentPath[1], CrName.collection.qName());
+			Content content = parent.add(parentPath[1], DName.collection.qName());
 			return content;
 		}
 	}