X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=6dfb4a017f57da6870d9ad0a59c81ea11d3aae76;hb=2d4dd736ab07b1ef3aaec0a9e5d29f30c551de9c;hp=c7915d0ed57bb89ed132419247c3eebc18037ff7;hpb=974b63d4aba182b4bd7860fd539c87087bb8b0ab;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index c7915d0ed..6dfb4a017 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -167,7 +167,7 @@ public class JcrUtils implements ArgeoJcrConstants {
 		buf.append('Y');
 		buf.append(cal.get(Calendar.YEAR));
 		buf.append('/');
-		
+
 		int month = cal.get(Calendar.MONTH) + 1;
 		buf.append('M');
 		if (month < 10)
@@ -225,8 +225,9 @@ public class JcrUtils implements ArgeoJcrConstants {
 	}
 
 	/**
-	 * @deprecated use {@link #mkdirs(Session, String, String, String, Boolean)}
-	 *             instead.
+	 * use {@link #mkdirs(Session, String, String, String, Boolean)} instead.
+	 * 
+	 * @deprecated
 	 */
 	@Deprecated
 	public static Node mkdirs(Session session, String path, String type,
@@ -746,8 +747,13 @@ public class JcrUtils implements ArgeoJcrConstants {
 
 	/** Logs out the session, not throwing any exception, even if it is null. */
 	public static void logoutQuietly(Session session) {
-		if (session != null)
-			session.logout();
+		try {
+			if (session != null)
+				if (session.isLive())
+					session.logout();
+		} catch (Exception e) {
+			// silent
+		}
 	}
 
 	/** Returns the home node of the session user or null if none was found. */
@@ -842,15 +848,35 @@ public class JcrUtils implements ArgeoJcrConstants {
 			if (session.hasPendingChanges())
 				throw new ArgeoException(
 						"Session has pending changes, save them first");
+
 			String homePath = homeBasePath + '/'
 					+ firstCharsToPath(username, 2) + '/' + username;
-			Node userHome = JcrUtils.mkdirs(session, homePath);
 
-			Node userProfile = userHome.addNode(ArgeoNames.ARGEO_PROFILE);
-			userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
-			userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
-			session.save();
-			// we need to save the profile before adding the user home type
+			if (session.itemExists(homePath)) {
+				try {
+					throw new ArgeoException(
+							"Trying to create a user home that already exists");
+				} catch (Exception e) {
+					// we use this workaround to be sure to get the stack trace
+					// to identify the sink of the bug.
+					log.warn("trying to create an already existing userHome at path:"
+							+ homePath + ". Stack trace : ");
+					e.printStackTrace();
+				}
+			}
+
+			Node userHome = JcrUtils.mkdirs(session, homePath);
+			Node userProfile;
+			if (userHome.hasNode(ArgeoNames.ARGEO_PROFILE)) {
+				log.warn("userProfile node already exists for userHome path: "
+						+ homePath + ". We do not add a new one");
+			} else {
+				userProfile = userHome.addNode(ArgeoNames.ARGEO_PROFILE);
+				userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
+				userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
+				session.save();
+				// we need to save the profile before adding the user home type
+			}
 			userHome.addMixin(ArgeoTypes.ARGEO_USER_HOME);
 			// see
 			// http://jackrabbit.510166.n4.nabble.com/Jackrabbit-2-0-beta-6-Problem-adding-a-Mixin-type-with-mandatory-properties-after-setting-propertiesn-td1290332.html
@@ -916,4 +942,64 @@ public class JcrUtils implements ArgeoJcrConstants {
 			throw new ArgeoException("Cannot update last modified", e);
 		}
 	}
+
+	/**
+	 * Returns a String representing the short version (see <a
+	 * href="http://jackrabbit.apache.org/node-type-notation.html"> Node type
+	 * Notation </a> attributes grammar) of the main business attributes of this
+	 * property definition
+	 * 
+	 * @param prop
+	 */
+	public static String getPropertyDefinitionAsString(Property prop) {
+		StringBuffer sbuf = new StringBuffer();
+		try {
+			if (prop.getDefinition().isAutoCreated())
+				sbuf.append("a");
+			if (prop.getDefinition().isMandatory())
+				sbuf.append("m");
+			if (prop.getDefinition().isProtected())
+				sbuf.append("p");
+			if (prop.getDefinition().isMultiple())
+				sbuf.append("*");
+		} catch (RepositoryException re) {
+			throw new ArgeoException(
+					"unexpected error while getting property definition as String",
+					re);
+		}
+		return sbuf.toString();
+	}
+
+	/**
+	 * Estimate the sub tree size from current node. Computation is based on the
+	 * Jcr {@link Property.getLength()} method. Note : it is not the exact size
+	 * used on the disk by the current part of the JCR Tree.
+	 */
+
+	public static long getNodeApproxSize(Node node) {
+		long curNodeSize = 0;
+		try {
+			PropertyIterator pi = node.getProperties();
+			while (pi.hasNext()) {
+				Property prop = pi.nextProperty();
+				if (prop.isMultiple()) {
+					int nb = prop.getLengths().length;
+					for (int i = 0; i < nb; i++) {
+						curNodeSize += (prop.getLengths()[i] > 0 ? prop
+								.getLengths()[i] : 0);
+					}
+				} else
+					curNodeSize += (prop.getLength() > 0 ? prop.getLength() : 0);
+			}
+
+			NodeIterator ni = node.getNodes();
+			while (ni.hasNext())
+				curNodeSize += getNodeApproxSize(ni.nextNode());
+			return curNodeSize;
+		} catch (RepositoryException re) {
+			throw new ArgeoException(
+					"Unexpected error while recursively determining node size.",
+					re);
+		}
+	}
 }