From 0b2c404d5521aeb3d944ee7c1a0251946f9bd9b4 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 6 Aug 2007 13:38:48 +0000 Subject: [PATCH] Have HSSFDateUtil.isCellDateFormatted make use of HSSFDateUtils.isADateFormat. A few improvements to isADateFormat, and to HSSFCellStyle to allow calling of it. Plus tests git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@563129 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/changes.xml | 4 + src/documentation/content/xdocs/status.xml | 4 + .../apache/poi/hssf/usermodel/HSSFCell.java | 8 ++ .../poi/hssf/usermodel/HSSFCellStyle.java | 13 +++ .../poi/hssf/usermodel/HSSFDateUtil.java | 44 +++++++++- .../org/apache/poi/hssf/data/DateFormats.xls | Bin 0 -> 13824 bytes .../poi/hssf/usermodel/TestHSSFDateUtil.java | 77 +++++++++++++++++- 7 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 src/testcases/org/apache/poi/hssf/data/DateFormats.xls diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index 64fb1d0be5..be1def70bb 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -36,7 +36,11 @@ + Improvements to HSSFDateUtils.isADateFormat, and have HSSFDateUtil.isCellDateFormatted use this + 42999 - [PATCH] - Fix for HSSFPatriarch positioning problems + Support for write-protecting a HSSF workbook Support for querying, setting and un-setting protection on sheets in a HSSF workbook + Initial HSMF (outlook) support Tidy up the javadocs diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 34694bc306..5fe08dbd44 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -33,7 +33,11 @@ + Improvements to HSSFDateUtils.isADateFormat, and have HSSFDateUtil.isCellDateFormatted use this + 42999 - [PATCH] - Fix for HSSFPatriarch positioning problems + Support for write-protecting a HSSF workbook Support for querying, setting and un-setting protection on sheets in a HSSF workbook + Initial HSMF (outlook) support Tidy up the javadocs diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java index 752f598afe..ac3943da46 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java @@ -256,6 +256,14 @@ public class HSSFCell } return retval; } + + /** + * Returns the Workbook that this Cell is bound to + * @return + */ + protected Workbook getBoundWorkbook() { + return book; + } /** * set the cell's number within the row (0 based) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java index e978642c53..e2725937fa 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java @@ -18,7 +18,9 @@ package org.apache.poi.hssf.usermodel; +import org.apache.poi.hssf.model.Workbook; import org.apache.poi.hssf.record.ExtendedFormatRecord; +import org.apache.poi.hssf.record.FormatRecord; import org.apache.poi.hssf.util.*; /** @@ -266,6 +268,17 @@ public class HSSFCellStyle { return format.getFormatIndex(); } + + /** + * Get the contents of the format string, by looking up + * the DataFormat against the supplied workbook + * @see org.apache.poi.hssf.usermodel.HSSFDataFormat + */ + public String getDataFormatString(Workbook workbook) { + HSSFDataFormat format = new HSSFDataFormat(workbook); + + return format.getFormat(getDataFormat()); + } /** * set the font for this style diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java index 2da04e7f49..af16204fde 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java @@ -159,7 +159,7 @@ public class HSSFDateUtil * non US date formats. * * @param formatIndex The index of the format, eg from ExtendedFormatRecord.getFormatIndex - * @param formatString The format string + * @param formatString The format string, eg from FormatRecord.getFormatString * @see #isInternalDateFormat(int) */ public static boolean isADateFormat(int formatIndex, String formatString) { @@ -173,12 +173,26 @@ public class HSSFDateUtil return false; } + String fs = formatString; + // Translate \- into just -, before matching - String fs = formatString.replaceAll("\\\\-","-"); + fs = fs.replaceAll("\\\\-","-"); + // And \, into , + fs = fs.replaceAll("\\\\,",","); + // And '\ ' into ' ' + fs = fs.replaceAll("\\\\ "," "); + + // If it end in ;@, that's some crazy dd/mm vs mm/dd + // switching stuff, which we can ignore + fs = fs.replaceAll(";@", ""); + + // If it starts with [$-...], then it is a date, but + // who knows what that starting bit is all about + fs = fs.replaceAll("\\[\\$\\-.*?\\]", ""); // Otherwise, check it's only made up of: - // y m d - / - if(fs.matches("^[ymd\\-/]+$")) { + // y m d - / , + if(fs.matches("^[ymd\\-/, ]+$")) { return true; } @@ -222,12 +236,34 @@ public class HSSFDateUtil * Check if a cell contains a date * Since dates are stored internally in Excel as double values * we infer it is a date if it is formatted as such. + * @see #isADateFormat(int,string) * @see #isInternalDateFormat(int) */ public static boolean isCellDateFormatted(HSSFCell cell) { if (cell == null) return false; boolean bDate = false; + double d = cell.getNumericCellValue(); + if ( HSSFDateUtil.isValidExcelDate(d) ) { + HSSFCellStyle style = cell.getCellStyle(); + int i = style.getDataFormat(); + String f = style.getDataFormatString(cell.getBoundWorkbook()); + bDate = isADateFormat(i, f); + } + return bDate; + } + /** + * Check if a cell contains a date, checking only for internal + * excel date formats. + * As Excel stores a great many of its dates in "non-internal" + * date formats, you will not normally want to use this method. + * @see #isADateFormat(int,string) + * @see #isInternalDateFormat(int) + */ + public static boolean isCellInternalDateFormatted(HSSFCell cell) { + if (cell == null) return false; + boolean bDate = false; + double d = cell.getNumericCellValue(); if ( HSSFDateUtil.isValidExcelDate(d) ) { HSSFCellStyle style = cell.getCellStyle(); diff --git a/src/testcases/org/apache/poi/hssf/data/DateFormats.xls b/src/testcases/org/apache/poi/hssf/data/DateFormats.xls new file mode 100644 index 0000000000000000000000000000000000000000..6b2c3480b257f0847f8eebffb89d01e50daf0d23 GIT binary patch literal 13824 zcmeHOU2GIp6#izr+is=w7Z8gqn-)acE-gRCng+TUAsQtT2!Vu>Qo1EHP-@zm&_rcb zc*6w4gD)h8_yfj7F$VO(m^LxN7u1jtQD2H0AACU#CXxW__nq14Zc7)72@%OX+xs); zoO{oiZ|>YX=g#z-udBw6e^h%3lV~-Ha3fQS;yk{``UAmnB`D8ibQqL#StrZU{|JH7 zC@*Aj1Ya#US28-nY7uY=A)E@2G6#NS>cDfD39L!=_3rB(92)2v>K};TVS3zr=kY;m3m;?t)Zmpy=Hlx<>kyh zd}3|BH_kHD;!Emh4jj>N2hK*kH5foIy08~_S{gfWlW zZ>q0vY3oP?)mV5w?_u7V0i$i(#-7yne1#ZFbXx}sOIz~W^C%XsM-;J%8k2f4wMWo^ z7NAqc8{+0kXTtX-cbJvdCF&^aOe8xKv2YWXV6htJ)H?F&;!n_Dg(mQ_<{P2|lWh5% zoVoV)oWYf7M01|Opmo-M(A3Q4x2wh5m?Q-EiqkHcSqAmA@4z;7zR zZ7tCv zs&uiH)#@}f zoSnQk#&uR4=81Zo9Y(z<6Q``tJzT?soE~A*J3HLGDW2*Y>QU`!t7Uk5MRA#smr<)b zI-5y-`o!DaC?-4pYFRm9wVV<1Z%1j#%&+XZnr_atwWW-CiWfoaOqID%Nn_XE`~Cd- zog3Oajo)DWM$2C@PFizCmKG64u19#8lF_hi$)#6K`=I5=QD+(+ZFspWP2N~LvuwGU zx>3AnCkgy8S3ZU9Sgp=f`^N~CTMM0u4_P$CCj_h8!yXr>3W%qvCPcrCvOG;2lX-lg zxQVAT%GbND8IDw8`AZ=kdAJ`~_ES!H65O4@M1RMem0f&G?z#-rea0oaA90EQ9w~GHm z7tUQcwsc`j>SI_qx05@{^p4^Y^hgd4^e}QQZ z(?KTf2OMV7{=jLb{QUs!C5RNef3aYO^`&F=DVkiyxPc&D?ML{ph;r5Cx#|j(QBj7p zxu8zA^bhPA)H|g?Ywz|7h>0VIfJ49`;1F;KI0PI54grUNL%<>65V)riP#mw&STV5T zZ+-WtPu&z#>;F0w>+54Sh0TiD6~F5XLB;)&SFzMPf5rL1w~31NwI3k)btaXL?oI?Y zqMyGZ#IY9pSPo#AS8n<=2N5qgGmWEoR5>tWIoA2b#9ZSc;B2Aw0qns}^J7oIo_5Lq z02#M0Kc?M~TSB4;HsN{n@z-VN{uEKzWj={B#Q*!~C#NtyO#8ZrbpK4(zJ1#}ZvP2d V=r$jE>