litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1665 Handle display of core:DateTimeValue with a non-standard core:dateTime data prop value

Browse source
This commit is contained in:
rjy7 2011-01-18 00:46:30 +00:00
parent 34fdd8b33d
commit e176d1f39f
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
webapp/web/templates/freemarker/lib/lib-datetime.ftl
View file

@ -98,26 +98,42 @@
</#function> </#function>
<#-- Apply a precision and format type to format a datetime --> <#-- Apply a precision and format type to format a datetime -->
<#function formatXsdDateTime dateTime precision="" formatType="short"> <#function formatXsdDateTime dateTimeStr precision="" formatType="short">
<#-- First convert the string to a datetime object. <#-- First convert the string to a datetime object.
For now, strip away time zone rather than displaying it. --> For now, strip away time zone rather than displaying it. -->
<#local dateTime = dateTime?replace("T", " ")?replace("Z.*$", "", "r")> <#local dateTimeStr = dateTimeStr?replace("T", " ")?replace("Z.*$", "", "r")>
<#-- If no precision is specified, assign it from the datetime value. <#local dateTimeStringFormat = "yyyy-MM-dd HH:mm:ss">
This must be done before conversion to a datetime object, since that
process fills in zero values. --> <#-- If a non-standard datetime format (e.g, "2000-04" from
<#if ! precision?has_content> "2000-04"^^<http://www.w3.org/2001/XMLSchema#gYearMonth>), just
<#local precision = getPrecision(dateTime)> return the string without attempting to format. Possibly this should
be handled in Java by examining the xsd type and making an appropriate
conversion. -->
<#if ! dateTimeStr?matches(dateTimeStringFormat)>
<#return dateTimeStr>
</#if> </#if>
<#-- Convert the string to a datetime object. --> <#-- Convert the string to a datetime object. -->
<#local dateTime = dateTime?datetime("yyyy-MM-dd HH:mm:ss")> <#local dateTimeObj = dateTimeStr?datetime(dateTimeStringFormat)>
<#if dateTimeObj == null>
<#return "non-standard datetime string">
</#if>
<#-- If no precision is specified, assign it from the datetime value.
Pass dateTimeStr rather than dateTimeObj, because dateTimeObj
replaces zeroes with default values, whereas we want to set
precision based on whether the times values are all 0. -->
<#if ! precision?has_content>
<#local precision = getPrecision(dateTimeStr)>
</#if>
<#-- Get the format string for the datetime output --> <#-- Get the format string for the datetime output -->
<#local format = getFormat(formatType, precision)> <#local format = getFormat(formatType, precision)>
<#return dateTime?string(format)> <#return dateTimeObj?string(format)>
</#function> </#function>
<#function getPrecision dateTime> <#function getPrecision dateTime>