X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FTreeTestResultNodeMapper.java;h=162e5d2f7409d0fed388f30d240e9d480ecb41a1;hb=f1949f18a209de9f9ee110e2e2654882529b8ec5;hp=471de7100879f918c8b8a6ffa93f16257a8889ff;hpb=b554c0910f6ddce935ceea5f99d399fe23af6f58;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
index 471de7100..162e5d2f7 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
@@ -94,12 +94,28 @@ public class TreeTestResultNodeMapper extends BeanNodeMapper {
 			// We add the tags
 			Map<String, String> tags = elements.get(key).getTags();
 			for (String tag : tags.keySet()) {
+				NodeIterator tagIt = childNode.getNodes("tag");
+				Node tagNode = null;
+				while (tagIt.hasNext()) {
+					Node n = tagIt.nextNode();
+					if (n.getProperty("name").getString().equals(tag)) {
+						tagNode = n;
+					}
+				}
+
+				if (tagNode == null) {
+					tagNode = childNode.addNode("tag");
+					tagNode.setProperty("name", tag);
+				}
+
+				tagNode.setProperty("value", tags.get(tag));
+
 				// remove forbidden characters
-				String cleanTag = JcrUtils.removeForbiddenCharacters(tag);
-				if (!cleanTag.equals(tag))
-					log.warn("Tag '" + tag + "' persisted as '" + cleanTag
-							+ "'");
-				childNode.setProperty(cleanTag, tags.get(tag));
+				// String cleanTag = JcrUtils.removeForbiddenCharacters(tag);
+				// if (!cleanTag.equals(tag))
+				// log.warn("Tag '" + tag + "' persisted as '" + cleanTag
+				// + "'");
+				// childNode.setProperty(cleanTag, tags.get(tag));
 			}
 
 			// We set the class in order to be able to retrieve
@@ -271,22 +287,29 @@ public class TreeTestResultNodeMapper extends BeanNodeMapper {
 			se.setLabel(curNode.getProperty("label").getString());
 
 			Map<String, String> tagMap = new TreeMap<String, String>();
-			PropertyIterator tagIt = curNode.getProperties();
-			tags: while (tagIt.hasNext()) {
-				Property prop = tagIt.nextProperty();
-				//log.debug("Handling property named : " + prop.getName());
-
-				// TODO Define a rule to generalize it
-				// Specific case. mainly uuid
-				if ("uuid".equals(prop.getName())
-						|| prop.getName().equals(getClassProperty())
-						|| prop.getName().startsWith("jcr")) {
-					continue tags;
-				}
+			NodeIterator tagIt = node.getNodes("tag");
+			while (tagIt.hasNext()) {
+				Node tagNode = tagIt.nextNode();
+				tagMap.put(tagNode.getProperty("name").getString(), tagNode
+						.getProperty("value").getString());
 
-				// else it's an attribute, we retrieve it
-				tagMap.put(prop.getName(), prop.getString());
 			}
+			// PropertyIterator tagIt = curNode.getProperties();
+			// tags: while (tagIt.hasNext()) {
+			// Property prop = tagIt.nextProperty();
+			// //log.debug("Handling property named : " + prop.getName());
+			//
+			// // TODO Define a rule to generalize it
+			// // Specific case. mainly uuid
+			// if ("uuid".equals(prop.getName())
+			// || prop.getName().equals(getClassProperty())
+			// || prop.getName().startsWith("jcr")) {
+			// continue tags;
+			// }
+			//
+			// // else it's an attribute, we retrieve it
+			// tagMap.put(prop.getName(), prop.getString());
+			// }
 
 			se.setTags(tagMap);
 			elements.put(tsp, se);