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=fecd7f2911bfd0b1bd0439d021536110bf874b0a;hb=9345ad49cb9c3505c3cae938efd028ebffd1a2d8;hp=7b4110d8e487e31428398d37ccc7791f4dca5092;hpb=c5bb48d71ad5d71e389137e5fb95f96d9005a942;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 7b4110d8e..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
@@ -9,10 +9,14 @@ 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;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -35,6 +39,7 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 
 	private ClassLoader classLoader = getClass().getClassLoader();
 	private ApplicationContext applicationContext;
+	private List<Class<?>> additionalClasses = new ArrayList<Class<?>>();
 
 	private Map<Class<?>, Map<Object, Object>> model = new HashMap<Class<?>, Map<Object, Object>>();
 
@@ -44,6 +49,8 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 
 	private List<Resource> workbooks = new ArrayList<Resource>();
 
+	private Integer charset = 0;
+
 	public void afterPropertiesSet() throws Exception {
 		init();
 	}
@@ -74,10 +81,19 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 			log.debug(references.size() + " references linked");
 	}
 
+	public List<Class<?>> getSupportedClasses() {
+		List<Class<?>> res = new ArrayList<Class<?>>();
+		res.addAll(additionalClasses);
+		res.addAll(model.keySet());
+		return res;
+	}
+
 	public void load(InputStream in, List<Reference> references,
 			Map<String, List<Object>> tempRefs) {
 		try {
-			Workbook workbook = Workbook.getWorkbook(in);
+			WorkbookSettings workbookSettings = new WorkbookSettings();
+			workbookSettings.setCharacterSet(charset);
+			Workbook workbook = Workbook.getWorkbook(in, workbookSettings);
 			for (Sheet sheet : workbook.getSheets()) {
 				loadSheet(sheet, references, tempRefs);
 			}
@@ -154,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
@@ -313,6 +340,18 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 		this.classLoader = classLoader;
 	}
 
+	public List<Class<?>> getAdditionalClasses() {
+		return additionalClasses;
+	}
+
+	public void setAdditionalClasses(List<Class<?>> additionalClasses) {
+		this.additionalClasses = additionalClasses;
+	}
+
+	public void setCharset(Integer charset) {
+		this.charset = charset;
+	}
+
 	public static class Reference {
 		private Object object;
 		private String property;