X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Ftabular%2FJcrTabularWriter.java;h=0727b784e617507dd8e2dc171d1b671371fab91a;hb=a473a5c7af8d33a931510dec4c93413a341da1d9;hp=cd6feb565545b0e643ed3a41f8e9b1ca9a76e15a;hpb=5b8a94ea4b5ecba326ebd3f755b3e2c2f1d94310;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java
index cd6feb565..0727b784e 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularWriter.java
@@ -30,10 +30,17 @@ public class JcrTabularWriter implements TabularWriter {
 			String contentNodeType) {
 		try {
 			for (TabularColumn column : columns) {
-				Node columnNode = tableNode.addNode(column.getName(),
+				String normalized = JcrUtils.replaceInvalidChars(column
+						.getName());
+				Node columnNode = tableNode.addNode(normalized,
 						ArgeoTypes.ARGEO_COLUMN);
-				columnNode.setProperty(Property.JCR_REQUIRED_TYPE,
-						PropertyType.nameFromValue(column.getType()));
+				columnNode.setProperty(Property.JCR_TITLE, column.getName());
+				if (column.getType() != null)
+					columnNode.setProperty(Property.JCR_REQUIRED_TYPE,
+							PropertyType.nameFromValue(column.getType()));
+				else
+					columnNode.setProperty(Property.JCR_REQUIRED_TYPE,
+							PropertyType.TYPENAME_STRING);
 			}
 			contentNode = tableNode.addNode(Property.JCR_CONTENT,
 					contentNodeType);
@@ -48,7 +55,7 @@ public class JcrTabularWriter implements TabularWriter {
 		}
 	}
 
-	public void appendRow(List<?> row) {
+	public void appendRow(Object[] row) {
 		csvWriter.writeLine(row);
 	}