X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=554e9f34c6e8ff2118699a16cd172760238a9ab4;hb=3e2ab8c7275cf2570f9a53158d12716b8051b376;hp=d70a51669f7dcf8bfa78f5b691cd1ed9e85a15e2;hpb=5b81c294ae7541cc6a2a5867d1e1e8aa7f4358b5;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 d70a51669..554e9f34c 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
@@ -21,6 +21,8 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
@@ -33,6 +35,7 @@ import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Value;
+import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
 
@@ -199,7 +202,7 @@ public class JcrUtils {
 					else
 						currentNode = currentNode.addNode(part);
 					if (versioning)
-						currentNode.addMixin(ArgeoJcrConstants.MIX_VERSIONABLE);
+						currentNode.addMixin(NodeType.MIX_VERSIONABLE);
 					if (log.isTraceEnabled())
 						log.debug("Added folder " + part + " as " + current);
 				} else {
@@ -260,7 +263,7 @@ public class JcrUtils {
 			// First output the node path
 			log.debug(node.getPath());
 			// Skip the virtual (and large!) jcr:system subtree
-			if (node.getName().equals(ArgeoJcrConstants.JCR_SYSTEM)) {
+			if (node.getName().equals("jcr:system")) {
 				return;
 			}
 
@@ -425,6 +428,56 @@ public class JcrUtils {
 		}
 	}
 
+	/**
+	 * Compare only a restricted list of properties of two nodes. No
+	 * recursivity.
+	 * 
+	 */
+	public static Map<String, PropertyDiff> diffProperties(Node reference,
+			Node observed, List<String> properties) {
+		Map<String, PropertyDiff> diffs = new TreeMap<String, PropertyDiff>();
+		try {
+			Iterator<String> pit = properties.iterator();
+
+			props: while (pit.hasNext()) {
+				String name = pit.next();
+				if (!reference.hasProperty(name)) {
+					if (!observed.hasProperty(name))
+						continue props;
+					Value val = observed.getProperty(name).getValue();
+					try {
+						// empty String but not null
+						if ("".equals(val.getString()))
+							continue props;
+					} catch (Exception e) {
+						// not parseable as String, silent
+					}
+					PropertyDiff pDiff = new PropertyDiff(PropertyDiff.ADDED,
+							name, null, val);
+					diffs.put(name, pDiff);
+				} else if (!observed.hasProperty(name)) {
+					PropertyDiff pDiff = new PropertyDiff(PropertyDiff.REMOVED,
+							name, reference.getProperty(name).getValue(), null);
+					diffs.put(name, pDiff);
+				} else {
+					Value referenceValue = reference.getProperty(name)
+							.getValue();
+					Value newValue = observed.getProperty(name).getValue();
+					if (!referenceValue.equals(newValue)) {
+						PropertyDiff pDiff = new PropertyDiff(
+								PropertyDiff.MODIFIED, name, referenceValue,
+								newValue);
+						diffs.put(name, pDiff);
+					}
+				}
+			}
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot diff " + reference + " and "
+					+ observed, e);
+		}
+		return diffs;
+	}
+
 	/** Builds a property relPath to be used in the diff. */
 	private static String propertyRelPath(String baseRelPath,
 			String propertyName) {