[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage XlsToXmlPipelineStage.java,1.5,1.5.4.1

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv942/modules/conversion/src/com/babeldoc/conversion/pipeline/stage

Modified Files:
      Tag: V1-2
	XlsToXmlPipelineStage.java 
Log Message:
- Excel converter now can read cells with formulas
- Numbers are parsed using format specified in Excel cells and given locale. Locale can be specified as config option in XlsToXml pipeline stage

Index: XlsToXmlPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage/XlsToXmlPipelineStage.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** XlsToXmlPipelineStage.java	7 Aug 2003 21:09:02 -0000	1.5
--- XlsToXmlPipelineStage.java	6 Jan 2004 14:09:59 -0000	1.5.4.1
***************
*** 74,79 ****
--- 74,81 ----
  import com.babeldoc.core.I18n;
  
+ import java.text.SimpleDateFormat;
  import java.util.Collection;
  import java.util.ArrayList;
+ import java.util.Date;
  
  /**
***************
*** 87,92 ****
  public class XlsToXmlPipelineStage extends PipelineStage {
  
! 	public static String DATE_FORMAT = "dd.mm.yyyy";
    public static final String ENCODING = "encoding";
  
    /**
--- 89,96 ----
  public class XlsToXmlPipelineStage extends PipelineStage {
  
! 	public static String DATE_FORMAT = "dd.MM.yyyy";
    public static final String ENCODING = "encoding";
+   protected static final String ATTRIBUTES = "attributes";
+   protected static final String LOCALE = "locale";
  
    /**
***************
*** 110,114 ****
              IConfigOptionType.STRING, null, false,
              I18n.get("conversion.pipeline.stage.XlsToXml.encoding")));
! 
          return options;
  			}
--- 114,120 ----
              IConfigOptionType.STRING, null, false,
              I18n.get("conversion.pipeline.stage.XlsToXml.encoding")));
!         options.add(new ConfigOption(ATTRIBUTES, IConfigOptionType.MULTI, null, false, "Attributes"));
!         options.add(new ConfigOption(LOCALE, IConfigOptionType.STRING, null, false, 
!             I18n.get("conversion.pipeline.stage.XlsToXml.locale")));
          return options;
  			}
***************
*** 129,133 ****
  
  		try {
! 			PipelineDocument doc = ConversionHelper.render(new ExcelConverter().toXml(this.getDocument().getInputStream()),
            this.getDocument(), encoding);
        doc.setBinary(false);
--- 135,144 ----
  
  		try {
! 			
! 		  ExcelConverter converter = new ExcelConverter();
! 		  //we should make this more configurable later...
! 		  converter.getWorkBookAttributes().put("date", new SimpleDateFormat(DATE_FORMAT).format(new Date()));
! 		  //this.getInfo().getOptions().
!       PipelineDocument doc = ConversionHelper.render(converter.toXml(this.getDocument().getInputStream()),
            this.getDocument(), encoding);
        doc.setBinary(false);