From 6a40c8111e3dfd7e2ca31a0d1aefd4d9579d2928 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 11 Nov 2009 13:18:45 +0000 Subject: [PATCH] Fix issues with loadObject git-svn-id: https://svn.argeo.org/commons/trunk@3084 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/server/jxl/dao/JxlDaoSupport.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 subMap = new HashMap(); - 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 -- 2.30.2