From bed3ab6871d3424245d986fad3e237224a9134dd Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 10 Jul 2008 18:41:25 +0000 Subject: [PATCH] Fix bug #45365 - Handle more excel number formatting rules in FormatTrackingHSSFListener / XLS2CSVmra git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@675671 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/changes.xml | 1 + src/documentation/content/xdocs/status.xml | 1 + .../eventusermodel/examples/XLS2CSVmra.java | 48 +------------- .../FormatTrackingHSSFListener.java | 62 ++++++++++++++++++ .../org/apache/poi/hssf/data/45365.xls | Bin 0 -> 51712 bytes .../TestFormatTrackingHSSFListener.java | 43 ++++++++++-- 6 files changed, 105 insertions(+), 50 deletions(-) create mode 100644 src/testcases/org/apache/poi/hssf/data/45365.xls diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index 16a82aa3ae..808bea2a9c 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -37,6 +37,7 @@ + 45365 - Handle more excel number formatting rules in FormatTrackingHSSFListener / XLS2CSVmra 45373 - Improve the performance of HSSFSheet.shiftRows 45367 - Fixed bug when last row removed from sheet is row zero 45348 - Tweaks to RVA formula logic diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 7143b98d78..21d279ada1 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 45365 - Handle more excel number formatting rules in FormatTrackingHSSFListener / XLS2CSVmra 45373 - Improve the performance of HSSFSheet.shiftRows 45367 - Fixed bug when last row removed from sheet is row zero 45348 - Tweaks to RVA formula logic diff --git a/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java b/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java index 1c9b220356..632eacf5cc 100644 --- a/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java +++ b/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java @@ -20,10 +20,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintStream; -import java.text.DateFormat; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.Date; import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener; import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; @@ -37,7 +33,6 @@ import org.apache.poi.hssf.model.FormulaParser; import org.apache.poi.hssf.record.BOFRecord; import org.apache.poi.hssf.record.BlankRecord; import org.apache.poi.hssf.record.BoolErrRecord; -import org.apache.poi.hssf.record.CellValueRecordInterface; import org.apache.poi.hssf.record.FormulaRecord; import org.apache.poi.hssf.record.LabelRecord; import org.apache.poi.hssf.record.LabelSSTRecord; @@ -47,7 +42,6 @@ import org.apache.poi.hssf.record.RKRecord; import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.SSTRecord; import org.apache.poi.hssf.record.StringRecord; -import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.poifs.filesystem.POIFSFileSystem; @@ -180,7 +174,7 @@ public class XLS2CSVmra implements HSSFListener { nextRow = frec.getRow(); nextColumn = frec.getColumn(); } else { - thisStr = formatNumberDateCell(frec, frec.getValue()); + thisStr = formatListener.formatNumberDateCell(frec); } } else { thisStr = '"' + @@ -231,7 +225,7 @@ public class XLS2CSVmra implements HSSFListener { thisColumn = numrec.getColumn(); // Format - thisStr = formatNumberDateCell(numrec, numrec.getValue()); + thisStr = formatListener.formatNumberDateCell(numrec); break; case RKRecord.sid: RKRecord rkrec = (RKRecord) record; @@ -290,44 +284,6 @@ public class XLS2CSVmra implements HSSFListener { } } - /** - * Formats a number or date cell, be that a real number, or the - * answer to a formula - */ - private String formatNumberDateCell(CellValueRecordInterface cell, double value) { - // Get the built in format, if there is one - int formatIndex = formatListener.getFormatIndex(cell); - String formatString = formatListener.getFormatString(cell); - - if(formatString == null) { - return Double.toString(value); - } else { - // Is it a date? - if(HSSFDateUtil.isADateFormat(formatIndex,formatString) && - HSSFDateUtil.isValidExcelDate(value)) { - // Java wants M not m for month - formatString = formatString.replace('m','M'); - // Change \- into -, if it's there - formatString = formatString.replaceAll("\\\\-","-"); - - // Format as a date - Date d = HSSFDateUtil.getJavaDate(value, false); - DateFormat df = new SimpleDateFormat(formatString); - return df.format(d); - } else { - if(formatString == "General") { - // Some sort of wierd default - return Double.toString(value); - } - - // Format as a number - DecimalFormat df = new DecimalFormat(formatString); - return df.format(value); - } - } - } - - public static void main(String[] args) throws Exception { if(args.length < 1) { System.err.println("Use:"); diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java index b88143713d..5a84f45646 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java +++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java @@ -16,7 +16,11 @@ ==================================================================== */ package org.apache.poi.hssf.eventusermodel; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -24,8 +28,11 @@ import java.util.Map; import org.apache.poi.hssf.record.CellValueRecordInterface; import org.apache.poi.hssf.record.ExtendedFormatRecord; import org.apache.poi.hssf.record.FormatRecord; +import org.apache.poi.hssf.record.FormulaRecord; +import org.apache.poi.hssf.record.NumberRecord; import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.usermodel.HSSFDataFormat; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; /** * A proxy HSSFListener that keeps track of the document @@ -69,6 +76,61 @@ public class FormatTrackingHSSFListener implements HSSFListener { } } + /** + * Formats the given numeric of date Cell's contents + * as a String, in as close as we can to the way + * that Excel would do so. + * Uses the various format records to manage this. + * + * TODO - move this to a central class in such a + * way that hssf.usermodel can make use of it too + */ + public String formatNumberDateCell(CellValueRecordInterface cell) { + double value; + if(cell instanceof NumberRecord) { + value = ((NumberRecord)cell).getValue(); + } else if(cell instanceof FormulaRecord) { + value = ((FormulaRecord)cell).getValue(); + } else { + throw new IllegalArgumentException("Unsupported CellValue Record passed in " + cell); + } + + // Get the built in format, if there is one + int formatIndex = getFormatIndex(cell); + String formatString = getFormatString(cell); + + if(formatString == null) { + return Double.toString(value); + } else { + // Is it a date? + if(HSSFDateUtil.isADateFormat(formatIndex,formatString) && + HSSFDateUtil.isValidExcelDate(value)) { + // Java wants M not m for month + formatString = formatString.replace('m','M'); + // Change \- into -, if it's there + formatString = formatString.replaceAll("\\\\-","-"); + + // Format as a date + Date d = HSSFDateUtil.getJavaDate(value, false); + DateFormat df = new SimpleDateFormat(formatString); + return df.format(d); + } else { + if(formatString == "General") { + // Some sort of wierd default + return Double.toString(value); + } + if(formatString == "0.00E+00") { + // This seems to mean output as a normal double + return Double.toString(value); + } + + // Format as a number + DecimalFormat df = new DecimalFormat(formatString); + return df.format(value); + } + } + } + /** * Returns the format string, eg $##.##, for the * given number format index. diff --git a/src/testcases/org/apache/poi/hssf/data/45365.xls b/src/testcases/org/apache/poi/hssf/data/45365.xls new file mode 100644 index 0000000000000000000000000000000000000000..fbf1d97c589d0c82c232b0578b4ced79d75c6b71 GIT binary patch literal 51712 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 j#*H40{}@33^9v(&+W{CU+D59Mqqa 0); + } + } + + // TODO - test some specific format strings + } + private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} private final List _records = new ArrayList(); -- 2.39.5