|
From: <de...@us...> - 2004-01-08 11:37:16
|
Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv7807/modules/conversion/src/com/babeldoc/conversion/pipeline/stage
Modified Files:
Tag: V1-2
XlsToXmlPipelineStage.java
Log Message:
- locale config parameter is not ignored now in pipeline stage
- added formatData config option which could be used for specifying if dates and numbers should be formatted. Default is true.
- added noformat command line option to ExcelConversionClient which can be used for setting formatData option to false.
Index: XlsToXmlPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage/XlsToXmlPipelineStage.java,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** XlsToXmlPipelineStage.java 6 Jan 2004 14:09:59 -0000 1.5.4.1
--- XlsToXmlPipelineStage.java 8 Jan 2004 11:37:13 -0000 1.5.4.2
***************
*** 88,97 ****
*/
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";
!
/**
* Construct this stage - create the information object
--- 88,97 ----
*/
public class XlsToXmlPipelineStage extends PipelineStage {
!
! public static String DATE_FORMAT = "dd.MM.yyyy";
! public static final String ENCODING = "encoding";
! public static final String ATTRIBUTES = "attributes";
! public static final String LOCALE = "locale";
! public static final String FORMAT_DATA = "formatData";
/**
* Construct this stage - create the information object
***************
*** 117,120 ****
--- 117,123 ----
options.add(new ConfigOption(LOCALE, IConfigOptionType.STRING, null, false,
I18n.get("conversion.pipeline.stage.XlsToXml.locale")));
+ options.add(new ConfigOption(FORMAT_DATA,
+ IConfigOptionType.BOOLEAN,"true", false,
+ I18n.get("conversion.pipeline.stage.XlsToXml.formatData")));
return options;
}
***************
*** 139,142 ****
--- 142,148 ----
//we should make this more configurable later...
converter.getWorkBookAttributes().put("date", new SimpleDateFormat(DATE_FORMAT).format(new Date()));
+
+ converter.setFormatData(this.getInfo().getBooleanValue(FORMAT_DATA));
+ converter.setLocale(this.getOptions(LOCALE));
//this.getInfo().getOptions().
PipelineDocument doc = ConversionHelper.render(converter.toXml(this.getDocument().getInputStream()),
|