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=7b4110d8e487e31428398d37ccc7791f4dca5092;hb=c5bb48d71ad5d71e389137e5fb95f96d9005a942;hp=0488d519815896da54ccde15f204a2860e12bb02;hpb=41848e7c37cc837179b0e1e8f91b7afd16fb2af4;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 0488d5198..7b4110d8e 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
@@ -45,37 +45,42 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 	private List<Resource> workbooks = new ArrayList<Resource>();
 
 	public void afterPropertiesSet() throws Exception {
+		init();
+	}
+
+	public void init() {
+		// used to resolve inner references
+		Map<String, List<Object>> tempRefs = new HashMap<String, List<Object>>();
+
+		List<Reference> references = new ArrayList<Reference>();
+
 		for (Resource res : workbooks) {
 			InputStream in = null;
 			try {
 				in = res.getInputStream();
-				load(in);
+				load(in, references, tempRefs);
+			} catch (Exception e) {
+				throw new ArgeoServerException("Cannot load stream", e);
 			} finally {
 				IOUtils.closeQuietly(in);
 			}
 		}
 
+		// Inject references
+		for (Reference ref : references) {
+			injectReference(ref, tempRefs);
+		}
+		if (log.isDebugEnabled())
+			log.debug(references.size() + " references linked");
 	}
 
-	public void load(InputStream in) {
+	public void load(InputStream in, List<Reference> references,
+			Map<String, List<Object>> tempRefs) {
 		try {
-			// used to resolve inner references
-			Map<String, List<Object>> tempRefs = new HashMap<String, List<Object>>();
-
-			List<Reference> references = new ArrayList<Reference>();
-
 			Workbook workbook = Workbook.getWorkbook(in);
-
 			for (Sheet sheet : workbook.getSheets()) {
 				loadSheet(sheet, references, tempRefs);
 			}
-
-			for (Reference ref : references) {
-				injectReference(ref, tempRefs);
-			}
-			if (log.isDebugEnabled())
-				log.debug(references.size() + " references linked");
-
 		} catch (Exception e) {
 			throw new ArgeoServerException("Cannot load workbook", e);
 		}
@@ -130,6 +135,10 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware,
 		if (cell instanceof FormulaCell) {
 			String formula = ((FormulaCell) cell).getFormula();
 			int index = formula.indexOf('!');
+			if (index < 0)
+				throw new ArgeoServerException("Cannot interpret formula "
+						+ formula);
+			;
 			String targetSheet = formula.substring(0, index);
 			// assume no double letters!!
 			String targetRowStr = formula.substring(index + 2);