From 1df27c72afb2148588de3e7e82f257ad583d8bd7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 10 Nov 2009 21:14:30 +0000
Subject: [PATCH] Fix issues with encoding and locale

git-svn-id: https://svn.argeo.org/commons/trunk@3079 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../argeo/server/jxl/dao/JxlDaoSupport.java   | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 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 48dd8b233..2e31dbddd 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
@@ -3,12 +3,15 @@ package org.argeo.server.jxl.dao;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 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;
@@ -27,12 +30,15 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 		LightDaoSupport, ApplicationContextAware, InitializingBean {
 	private final static Log log = LogFactory.getLog(JxlDaoSupport.class);
 
-	private Integer charset = 0;
+	private String encoding = "cp1252";
+	private Locale locale = null;
 
 	protected void load(InputStream in, List<Reference> references) {
 		try {
 			WorkbookSettings workbookSettings = new WorkbookSettings();
-			workbookSettings.setCharacterSet(charset);
+			workbookSettings.setEncoding(encoding);
+			if (locale != null)
+				workbookSettings.setLocale(locale);
 			Workbook workbook = Workbook.getWorkbook(in, workbookSettings);
 			for (Sheet sheet : workbook.getSheets()) {
 				loadSheet(sheet, references);
@@ -129,13 +135,8 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 							log.trace("   row=" + row + ", firstColContents="
 									+ firstColContents + ", key=" + key
 									+ ", type=" + type);
-						if (type.equals(CellType.NUMBER)) {
-							map
-									.put(key, Double.parseDouble(cell
-											.getContents()));
-						} else {
-							map.put(key, cell.getContents());
-						}
+						Object cellValue = getCellValue(cell);
+						map.put(key, cellValue);
 
 						// check next row too see if one should break
 						if (row < firstColumn.length - 1)
@@ -190,37 +191,41 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 						+ cell.getContents() + " | targetSheet=" + targetSheet
 						+ ", 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();
-			// }
+			Object cellValue = getCellValue(cell);
 
 			if (propertyName.equals(keyProperty)
-					&& !StringUtils.hasText(contents)) {
+					&& !StringUtils.hasText(cellValue.toString())) {
 				// auto allocate key column if empty
-				contents = Integer.toString(row);
+				cellValue = Integer.toString(row);
 			}
 
 			if (propertyName.charAt(0) == '#') {// externalRef
 				references.add(new Reference(bw.getWrappedInstance(),
-						propertyName.substring(1), contents));
+						propertyName.substring(1), cellValue.toString()));
 			} else {
-				bw.setPropertyValue(propertyName, contents);
+				bw.setPropertyValue(propertyName, cellValue);
 			}
 
 			if (log.isTraceEnabled())
-				log.debug("  " + propertyName + "=" + contents);
+				log.debug("  " + propertyName + "=" + cellValue);
 		}
 
 	}
 
+	protected Object getCellValue(Cell cell) {
+		Object contents;
+		if (cell.getType() == CellType.LABEL) {
+			LabelCell lc = (LabelCell) cell;
+			contents = lc.getString();
+		} else if (cell.getType() == CellType.NUMBER) {
+			NumberCell nc = (NumberCell) cell;
+			contents = nc.getValue();
+		} else {
+			contents = cell.getContents();
+		}
+		return contents;
+	}
+
 	/** Returns true if property was set (thus bypassing standard process). */
 	protected Boolean overrideCell(Cell cell, BeanWrapper bw,
 			String propertyName, String keyProperty, Integer row,
@@ -268,7 +273,12 @@ public class JxlDaoSupport extends AbstractTabularDaoSupport implements
 		return clss;
 	}
 
-	public void setCharset(Integer charset) {
-		this.charset = charset;
+	public void setEncoding(String encoding) {
+		this.encoding = encoding;
+	}
+
+	public void setLocale(Locale locale) {
+		this.locale = locale;
 	}
+
 }
-- 
2.30.2