X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jxl%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjxl%2Fdao%2FJxlDaoSupport.java;h=64bcf03dc46e4f82aa72dd72289f49c9ab31a704;hb=6a40c8111e3dfd7e2ca31a0d1aefd4d9579d2928;hp=79fa2a606efb0d699b9cc0f4a5d46dd11ad43218;hpb=f99d677ed0ff66bf89b2662439802a240ee2e884;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java b/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java
index 79fa2a606..64bcf03dc 100644
--- a/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java
+++ b/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java
@@ -215,6 +215,8 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 					for (int col = 1; col < currentRow.length; col++) {
 						subKeys.add(getCellValue(currentRow[col]));
 					}
+					if (log.isTraceEnabled())
+						log.trace("   subKeys=" + subKeys);
 					row++;
 					String firstColContents = firstColumn[row].getContents();
 					mapRows: for (; row < firstColumn.length; row++) {
@@ -223,9 +225,9 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 						Object key = firstColContents;
 						Map<Object, Object> subMap = new HashMap<Object, Object>();
 
-						for (int col = 0; col < currentRow.length
-								&& col < subKeys.size(); col++) {
-							Object subKey = subKeys.get(col);
+						for (int col = 1; col < currentRow.length
+								&& col < subKeys.size() + 1; col++) {
+							Object subKey = subKeys.get(col - 1);
 							Cell cell = currentRow[col];
 							if (log.isTraceEnabled())
 								log.trace("   row=" + row
@@ -244,6 +246,7 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 						if (bw.isWritableProperty(firstColContents)
 								|| firstColContents.trim().equals("")
 								|| row == firstColumn.length - 1) {
+							log.trace(map);
 							bw.setPropertyValue(propertyName, map);
 							if (log.isTraceEnabled())
 								log.trace(" set map " + propertyName