X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FSlcJcrUtils.java;h=af7385000ffdb76e715ad0b4c28a84d6319b4764;hb=0214b0b8cd66e15c68dc1b0a14f110c05a9a0062;hp=2ebcb933fb21853a3c20d85e46368e86a28c0a2a;hpb=74904a755b5b344238eafa798419b80c5e74f7ed;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
index 2ebcb933f..af7385000 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -21,8 +21,10 @@ import java.util.GregorianCalendar;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
@@ -46,23 +48,20 @@ public class SlcJcrUtils implements SlcNames {
 		return buf.toString();
 	}
 
-	/** Module node name based on module name and version */
-	public static String getModuleNodeName(ModuleDescriptor moduleDescriptor) {
-		return moduleDescriptor.getName() + "_" + moduleDescriptor.getVersion();
-	}
-
-	/** Extracts the execution module name of a flow */
-	public static String flowExecutionModuleName(String fullFlowPath) {
+	/** Extracts the path to the related execution module */
+	public static String modulePath(String fullFlowPath) {
 		String[] tokens = fullFlowPath.split("/");
-		String moduleNodeName = tokens[AGENT_FACTORY_DEPTH + 2];
-		return moduleNodeName.substring(0, moduleNodeName.lastIndexOf('_'));
+		StringBuffer buf = new StringBuffer(fullFlowPath.length());
+		for (int i = 0; i < AGENT_FACTORY_DEPTH + 3; i++) {
+			if (!tokens[i].equals(""))
+				buf.append('/').append(tokens[i]);
+		}
+		return buf.toString();
 	}
 
-	/** Extracts the execution module version of a flow */
-	public static String flowExecutionModuleVersion(String fullFlowPath) {
-		String[] tokens = fullFlowPath.split("/");
-		String moduleNodeName = tokens[AGENT_FACTORY_DEPTH + 2];
-		return moduleNodeName.substring(moduleNodeName.lastIndexOf('_') + 1);
+	/** Module node name based on module name and version */
+	public static String getModuleNodeName(ModuleDescriptor moduleDescriptor) {
+		return moduleDescriptor.getName() + "_" + moduleDescriptor.getVersion();
 	}
 
 	/** Extracts the agent factory of a flow */
@@ -83,10 +82,18 @@ public class SlcJcrUtils implements SlcNames {
 				+ JcrUtils.dateAsPath(now, true) + uuid;
 	}
 
-	/** Create a new execution result path based on the current time */
-	public static String createResultPath(String uuid) {
+	/**
+	 * Create a new execution result path in the user home based on the current
+	 * time
+	 */
+	public static String createResultPath(Session session, String uuid)
+			throws RepositoryException {
 		Calendar now = new GregorianCalendar();
-		return SlcJcrConstants.RESULTS_BASE_PATH + '/'
+		Node userHome = UserJcrUtils.getUserHome(session);
+		if (userHome == null)
+			throw new SlcException("No user home available for "
+					+ session.getUserID());
+		return userHome.getPath() + '/' + SlcNames.SLC_RESULTS + '/'
 				+ JcrUtils.dateAsPath(now, true) + uuid;
 	}
 
@@ -189,20 +196,9 @@ public class SlcJcrUtils implements SlcNames {
 					+ node, e);
 		}
 	}
-	
+
 	/** Prevents instantiation */
 	private SlcJcrUtils() {
 
 	}
-
-	public static void main(String[] args) {
-		String path = "/slc/agents/vm/default/org.argeo_1.2.3/myPath/myFlow";
-		System.out.println("Flow relative path: " + flowRelativePath(path));
-		System.out.println("Execution Module Name: "
-				+ flowExecutionModuleName(path));
-		System.out.println("Execution Module Version: "
-				+ flowExecutionModuleVersion(path));
-		System.out.println("Agent Factory path: " + flowAgentFactoryPath(path));
-	}
-
 }