diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java index 02a641124..012f3b5a6 100644 --- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java +++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java @@ -78,11 +78,15 @@ public class FessFunctions { } public static Date parseDate(final String value) { + return parseDate(value, Constants.ISO_DATETIME_FORMAT); + } + + public static Date parseDate(final String value, String format) { if (value == null) { return null; } try { - final SimpleDateFormat sdf = new SimpleDateFormat(Constants.ISO_DATETIME_FORMAT); + final SimpleDateFormat sdf = new SimpleDateFormat(format); sdf.setTimeZone(Constants.TIMEZONE_UTC); return sdf.parse(value); } catch (final ParseException e) { diff --git a/src/main/webapp/WEB-INF/fe.tld b/src/main/webapp/WEB-INF/fe.tld index 86dde524b..a6c38ef65 100644 --- a/src/main/webapp/WEB-INF/fe.tld +++ b/src/main/webapp/WEB-INF/fe.tld @@ -59,6 +59,18 @@ + + + Returns Date from a given value. + + parseDateFormat + org.codelibs.fess.taglib.FessFunctions + java.util.Date parseDate(java.lang.String, java.lang.String) + + ${fe:parseDate(doc.tstamp, "yyyy-MM-dd HH:mm:ss")} + + + Returns formatted number from a given value.