Author: onealj
Date: Wed Feb 8 08:29:18 2017
New Revision: 1782119
URL: http://svn.apache.org/viewvc?rev=1782119&view=rev
Log:
bug 59227: parse dates formatted in Japanese or Chinese. Change javac source
encoding from ASCII to UTF-8 (same as build.gradle). Patch from jzhao. This
closes #48 on Github.
Modified:
poi/trunk/build.xml
poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1782119&r1=1782118&r2=1782119&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Feb 8 08:29:18 2017
@@ -65,7 +65,7 @@ under the License.
<property name="org.apache.poi.util.POILogger"
value="org.apache.poi.util.NullLogger"/>
<!-- issue warnings if source code contains unmappable characters for
encoding ASCII -->
- <property name="java.source.encoding" value="ASCII"/>
+ <property name="java.source.encoding" value="UTF-8"/>
<scriptdef name="propertyreset" language="javascript"
description="Allows to assign @{property} new value">
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1782119&r1=1782118&r2=1782119&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java Wed Feb 8
08:29:18 2017
@@ -49,9 +49,13 @@ public class DateUtil {
private static final Pattern date_ptrn1 =
Pattern.compile("^\\[\\$\\-.*?\\]");
private static final Pattern date_ptrn2 =
Pattern.compile("^\\[[a-zA-Z]+\\]");
private static final Pattern date_ptrn3a = Pattern.compile("[yYmMdDhHsS]");
- private static final Pattern date_ptrn3b =
Pattern.compile("^[\\[\\]yYmMdDhHsS\\-T/,. :\"\\\\]+0*[ampAMP/]*$");
+ // add "\u5e74 \u6708 \u65e5"ï¼å¹´ææ¥ï¼ for Chinese/Japanese date
format:2017å¹´2æ7æ¥
+ private static final Pattern date_ptrn3b =
Pattern.compile("^[\\[\\]yYmMdDhHsS\\-T/\u5e74\u6708\u65e5,.
:\"\\\\]+0*[ampAMP/]*$");
// elapsed time patterns: [h],[m] and [s]
private static final Pattern date_ptrn4 =
Pattern.compile("^\\[([hH]+|[mM]+|[sS]+)\\]");
+
+ // for format which start with "[DBNum1]" or "[DBNum2]" or "[DBNum3]"
could be a Chinese date
+ private static final Pattern date_ptrn5 =
Pattern.compile("^\\[DBNum(1|2|3)\\]");
/**
* Given a Date, converts it into a double representing its internal Excel
representation,
@@ -426,7 +430,9 @@ public class DateUtil {
cache(formatString, formatIndex, true);
return true;
}
-
+ // If it starts with [DBNum1] or [DBNum2] or [DBNum3]
+ // then it could be a Chinese date
+ fs = date_ptrn5.matcher(fs).replaceAll("");
// If it starts with [$-...], then could be a date, but
// who knows what that starting bit is all about
fs = date_ptrn1.matcher(fs).replaceAll("");
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java?rev=1782119&r1=1782118&r2=1782119&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java Wed
Feb 8 08:29:18 2017
@@ -18,6 +18,7 @@
package org.apache.poi.ss.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.Calendar;
import java.util.Date;
@@ -92,4 +93,34 @@ public class TestDateUtil {
assertEquals(expCal, actCal[2]);
assertEquals(expCal, actCal[3]);
}
+
+ @Test
+ public void isADateFormat() {
+ // Cell content 2016-12-8 as an example
+ // Cell show "12/8/2016"
+ assertTrue(DateUtil.isADateFormat(14, "m/d/yy"));
+ // Cell show "Thursday, December 8, 2016"
+ assertTrue(DateUtil.isADateFormat(182, "[$-F800]dddd\\,\\ mmmm\\
dd\\,\\ yyyy"));
+ // Cell show "12/8"
+ assertTrue(DateUtil.isADateFormat(183, "m/d;@"));
+ // Cell show "12/08/16"
+ assertTrue(DateUtil.isADateFormat(184, "mm/dd/yy;@"));
+ // Cell show "8-Dec-16"
+ assertTrue(DateUtil.isADateFormat(185, "[$-409]d\\-mmm\\-yy;@"));
+ // Cell show "D-16"
+ assertTrue(DateUtil.isADateFormat(186, "[$-409]mmmmm\\-yy;@"));
+
+ // Cell show "2016å¹´12æ8æ¥"
+ assertTrue(DateUtil.isADateFormat(165,
"yyyy\"å¹´\"m\"æ\"d\"æ¥\";@"));
+ // Cell show "2016å¹´12æ"
+ assertTrue(DateUtil.isADateFormat(164, "yyyy\"å¹´\"m\"æ\";@"));
+ // Cell show "12æ8æ¥"
+ assertTrue(DateUtil.isADateFormat(168, "m\"æ\"d\"æ¥\";@"));
+ // Cell show "åäºæå
«æ¥"
+ assertTrue(DateUtil.isADateFormat(181,
"[DBNum1][$-404]m\"æ\"d\"æ¥\";@"));
+ // Cell show "è´°é¶å£¹é年壹æ¾è´°æææ¥"
+ assertTrue(DateUtil.isADateFormat(177,
"[DBNum2][$-804]yyyy\"å¹´\"m\"æ\"d\"æ¥\";@"));
+ // Cell show "ï¼ï¼ï¼ï¼å¹´ï¼ï¼æï¼æ¥"
+ assertTrue(DateUtil.isADateFormat(178,
"[DBNum3][$-804]yyyy\"å¹´\"m\"æ\"d\"æ¥\";@"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]