X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jxl%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjxl%2Fdao%2FJxlDaoSupport.java;h=fecd7f2911bfd0b1bd0439d021536110bf874b0a;hb=9345ad49cb9c3505c3cae938efd028ebffd1a2d8;hp=dbd0793d9244e69aecfb8a9678b1a4fcfb7cede1;hpb=12cfed09974f82584c66c460500b5b3a61789e7e;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 dbd0793d9..fecd7f291 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
@@ -1,7 +1,6 @@
 package org.argeo.server.jxl.dao;
 
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -10,8 +9,11 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import jxl.Cell;
+import jxl.CellType;
 import jxl.FormulaCell;
 import jxl.JXLException;
+import jxl.LabelCell;
+import jxl.NumberCell;
 import jxl.Sheet;
 import jxl.Workbook;
 import jxl.WorkbookSettings;
@@ -168,6 +170,17 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 						+ ", targetRow=" + targetRow);
 		} else {
 			String contents = cell.getContents();
+
+//			if (cell.getType() == CellType.LABEL) {
+//				LabelCell lc = (LabelCell) cell;
+//				contents = lc.getString();
+//			} else if (cell.getType() == CellType.NUMBER) {
+//				NumberCell nc = (NumberCell) cell;
+//				contents = new Double(nc.getValue()).toString();
+//			} else {
+//				contents = cell.getContents();
+//			}
+
 			if (propertyName.equals(keyProperty)
 					&& !StringUtils.hasText(contents)) {
 				// auto allocate key column if empty