X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FTreeTestResultDaoJcr.java;h=71bdf529a02a41998a9f138fcb2ce6f96e988138;hb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;hp=df0a8f507747f4fc963c9eb7b368c0ed7ece13f4;hpb=be96ff87e70e7ebc7d8f92e26c7bc1242ffebe36;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultDaoJcr.java
index df0a8f507..71bdf529a 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultDaoJcr.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultDaoJcr.java
@@ -208,14 +208,41 @@ public class TreeTestResultDaoJcr extends AbstractSlcJcrDao implements
 					// We add the tags
 					Map<String, String> tags = relatedElements.get(key)
 							.getTags();
+
 					for (String tag : tags.keySet()) {
-						String cleanTag = JcrUtils
-								.removeForbiddenCharacters(tag);
-						if (!cleanTag.equals(tag))
-							log.warn("Tag '" + tag + "' persisted as '"
-									+ cleanTag + "'");
-						curNode.setProperty(cleanTag, tags.get(tag));
+						NodeIterator tagIt = curNode.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 = curNode.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));
 					}
+					// for (String tag : tags.keySet()) {
+					// String cleanTag = JcrUtils
+					// .removeForbiddenCharacters(tag);
+					// if (!cleanTag.equals(tag))
+					// log.warn("Tag '" + tag + "' persisted as '"
+					// + cleanTag + "'");
+					// curNode.setProperty(cleanTag, tags.get(tag));
+					// }
 
 					// We set the class in order to be able to retrieve
 					curNode.setProperty("class", StructureElement.class