mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-14 21:43:11 +00:00
[DS-660] Tidy up DCDate and DCDateTest - initial commit, more to be done.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5340 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Robin Taylor
@@ -58,7 +58,8 @@ import org.dspace.core.I18nUtil;
|
||||
* Dublin Core date utility class
|
||||
* <P>
|
||||
* Dates in the DSpace database are held in the ISO 8601 format. They are always
|
||||
* stored in UTC, converting to and from the current time zone.
|
||||
* stored in UTC, converting to and from the current time zone. In practice only dates
|
||||
* with a time component need to be converted.
|
||||
* <P>
|
||||
* <code>YYYY-MM-DDThh:mm:ss</code>
|
||||
* <P>
|
||||
@@ -68,10 +69,6 @@ import org.dspace.core.I18nUtil;
|
||||
* Examples: <code>1994-05-03T15:30:24</code>,<code>1995-10-04</code>,
|
||||
* <code>2001-10</code>,<code>1975</code>
|
||||
*
|
||||
* The main() method is a simple test program: run it with an optional
|
||||
* first argument that is a date string to decode, and it prints the
|
||||
* results of all the accessor methods.
|
||||
*
|
||||
* @author Robert Tansley
|
||||
* @author Larry Stone
|
||||
* @version $Revision$
|
||||
@@ -84,8 +81,14 @@ public class DCDate
|
||||
// UTC timezone
|
||||
private static final TimeZone utcZone = TimeZone.getTimeZone("UTC");
|
||||
|
||||
// local timezone
|
||||
private static final TimeZone localZone = new GregorianCalendar().getTimeZone();
|
||||
// components of time in UTC
|
||||
private GregorianCalendar calendar = null;
|
||||
|
||||
// components of time in local zone
|
||||
private GregorianCalendar localCalendar = null;
|
||||
|
||||
private enum DateGran { YEAR, MONTH, DAY, TIME }
|
||||
DateGran granularity = null;
|
||||
|
||||
// Full ISO 8601 is e.g. "2009-07-16T13:59:21Z"
|
||||
private static final SimpleDateFormat fullIso = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
|
||||
@@ -99,6 +102,10 @@ public class DCDate
|
||||
private static final SimpleDateFormat fullIso3 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
|
||||
static { fullIso3.setTimeZone(utcZone); }
|
||||
|
||||
// without minutes
|
||||
private static final SimpleDateFormat fullIso4 = new SimpleDateFormat("yyyy-MM-dd'T'HH");
|
||||
static { fullIso4.setTimeZone(utcZone); }
|
||||
|
||||
// Date-only ISO 8601 is e.g. "2009-07-16"
|
||||
private static final SimpleDateFormat dateIso = new SimpleDateFormat("yyyy-MM-dd");
|
||||
static { dateIso.setTimeZone(utcZone); }
|
||||
@@ -111,33 +118,16 @@ public class DCDate
|
||||
private static final SimpleDateFormat yearIso = new SimpleDateFormat("yyyy");
|
||||
static { yearIso.setTimeZone(utcZone); }
|
||||
|
||||
// components of time in UTC
|
||||
private GregorianCalendar calendar = null;
|
||||
|
||||
// components of time in local zone, if needed
|
||||
private GregorianCalendar localCalendar = null;
|
||||
|
||||
private enum DateGran { YEAR, MONTH, DAY, TIME };
|
||||
DateGran granularity = null;
|
||||
|
||||
/**
|
||||
* DateFormatSymbols for locale monthsname
|
||||
* DateFormatSymbols for locale months name
|
||||
*/
|
||||
private static DateFormatSymbols dfs = null;
|
||||
|
||||
|
||||
/**
|
||||
* note the session locale
|
||||
*/
|
||||
private static Locale langMonth = null;
|
||||
|
||||
|
||||
/**
|
||||
* Construct a clean date
|
||||
*/
|
||||
public DCDate()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Construct a date object from a Java <code>Date</code> object.
|
||||
@@ -147,168 +137,26 @@ public class DCDate
|
||||
*/
|
||||
public DCDate(Date date)
|
||||
{
|
||||
super();
|
||||
if(date != null)
|
||||
{
|
||||
setTime(date);
|
||||
if (!(calendar.get(Calendar.HOUR_OF_DAY) == 0 &&
|
||||
calendar.get(Calendar.MINUTE) == 0 &&
|
||||
calendar.get(Calendar.SECOND) == 0))
|
||||
{
|
||||
granularity = DateGran.TIME;
|
||||
}
|
||||
// if date is 1-jan, assume it's because this was set for year
|
||||
else if (calendar.get(Calendar.DAY_OF_MONTH) == 1 && calendar.get(Calendar.MONTH) == 0)
|
||||
{
|
||||
granularity = DateGran.YEAR;
|
||||
}
|
||||
// otherwise day
|
||||
else
|
||||
{
|
||||
granularity = DateGran.DAY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a date from a Dublin Core value
|
||||
*
|
||||
* @param fromDC
|
||||
* the date string, in ISO 8601 (no timezone, always use UTC/GMT)
|
||||
*/
|
||||
public DCDate(String fromDC)
|
||||
{
|
||||
super();
|
||||
|
||||
// An empty date is OK
|
||||
if ((fromDC == null) || fromDC.equals(""))
|
||||
if (date == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// default granularity
|
||||
|
||||
// By definition a Date has a time component so always set the granularity to TIME.
|
||||
granularity = DateGran.TIME;
|
||||
Date date = tryParse(fullIso, fromDC);
|
||||
if (date == null)
|
||||
date = tryParse(fullIso2, fromDC);
|
||||
if (date == null)
|
||||
date = tryParse(fullIso3, fromDC);
|
||||
if (date == null)
|
||||
{
|
||||
// NOTE: move GMT date to local midnight when granularity is coarse
|
||||
date = tryParse(dateIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
long ldate = date.getTime();
|
||||
date = new Date(ldate - localZone.getOffset(ldate));
|
||||
granularity = DateGran.DAY;
|
||||
}
|
||||
}
|
||||
if (date == null)
|
||||
{
|
||||
// NOTE: move GMT date to local midnight when granularity is coarse
|
||||
date = tryParse(yearMonthIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
long ldate = date.getTime();
|
||||
date = new Date(ldate - localZone.getOffset(ldate));
|
||||
granularity = DateGran.MONTH;
|
||||
}
|
||||
}
|
||||
if (date == null)
|
||||
{
|
||||
// NOTE: move GMT date to local midnight when granularity is coarse
|
||||
date = tryParse(yearIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
long ldate = date.getTime();
|
||||
date = new Date(ldate - localZone.getOffset(ldate));
|
||||
granularity = DateGran.YEAR;
|
||||
}
|
||||
}
|
||||
|
||||
if (date == null)
|
||||
log.warn("Mangled date: " + fromDC + " ..failed all attempts to parse as date.");
|
||||
else
|
||||
setTime(date);
|
||||
}
|
||||
|
||||
// Attempt to parse, swallowing errors; return null for failure.
|
||||
private synchronized Date tryParse(SimpleDateFormat sdf, String source)
|
||||
{
|
||||
try
|
||||
{
|
||||
return sdf.parse(source);
|
||||
}
|
||||
catch (ParseException pe)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the time components to reflect the absolute time in this Date.
|
||||
*
|
||||
* @param date
|
||||
* the Java <code>Date</code> object.
|
||||
*/
|
||||
private void setTime(Date date)
|
||||
{
|
||||
// Set the local calendar.
|
||||
localCalendar = new GregorianCalendar();
|
||||
localCalendar.setTime(date);
|
||||
|
||||
// Now set the UTC equivalent.
|
||||
calendar = new GregorianCalendar(utcZone);
|
||||
calendar.setTime(date);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a date representing the current instant in time.
|
||||
*
|
||||
* @return a DSpaceDate object representing the current instant.
|
||||
*/
|
||||
public static DCDate getCurrent()
|
||||
{
|
||||
return (new DCDate(new Date()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the date as a string to put back in the Dublin Core
|
||||
*
|
||||
* @return The date as a string.
|
||||
*/
|
||||
public String toString()
|
||||
{
|
||||
if (calendar == null)
|
||||
return "null";
|
||||
return toStringInternal();
|
||||
}
|
||||
|
||||
// When granularity is "day" or more, show the _local-time_ day because
|
||||
// when the granularity was coarse the local time value was set.
|
||||
private synchronized String toStringInternal()
|
||||
{
|
||||
if (granularity == DateGran.YEAR)
|
||||
return String.format("%4d", getYear());
|
||||
else if (granularity == DateGran.MONTH)
|
||||
return String.format("%4d-%02d", getYear(), getMonth());
|
||||
else if (granularity == DateGran.DAY)
|
||||
return String.format("%4d-%02d-%02d", getYear(), getMonth(), getDay());
|
||||
else
|
||||
return fullIso.format(calendar.getTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the date as a Java Date object, assuming the granularity is sufficient for it to be expressed as a Date.
|
||||
*
|
||||
* @return a Date object
|
||||
*/
|
||||
public Date toDate()
|
||||
{
|
||||
if ((calendar == null) || (!withinGranularity(DateGran.DAY)))
|
||||
return null;
|
||||
else
|
||||
return calendar.getTime();
|
||||
}
|
||||
/**
|
||||
* Set the date. The date passed in is assumed to be in the current time
|
||||
* zone, and is adjusting to fit the current time zone. Unknown values
|
||||
* should be given as -1.
|
||||
* Construct a date object from a bunch of component parts. The date passed in is assumed to be in the current
|
||||
* time zone. Unknown values should be given as -1.
|
||||
*
|
||||
* @param yyyy
|
||||
* the year
|
||||
@@ -323,8 +171,7 @@ public class DCDate
|
||||
* @param ss
|
||||
* the seconds
|
||||
*/
|
||||
|
||||
public void setDateLocal(int yyyy, int mm, int dd, int hh, int mn, int ss)
|
||||
public DCDate(int yyyy, int mm, int dd, int hh, int mn, int ss)
|
||||
{
|
||||
// default values
|
||||
int lyear = 0;
|
||||
@@ -365,25 +212,109 @@ public class DCDate
|
||||
granularity = DateGran.TIME;
|
||||
}
|
||||
|
||||
// do the timezone adjustment: get Date and put it in UTC zone.
|
||||
GregorianCalendar localGC = new GregorianCalendar(lyear, lmonth - 1, lday,
|
||||
lhours, lminutes, lseconds);
|
||||
setTime(localGC.getTime());
|
||||
}
|
||||
// Set the local calendar.
|
||||
localCalendar = new GregorianCalendar(lyear, lmonth - 1, lday,
|
||||
lhours, lminutes, lseconds);
|
||||
|
||||
// get cached calendar in local timezone
|
||||
private GregorianCalendar getLocalCalendar()
|
||||
{
|
||||
if (localCalendar == null)
|
||||
if (granularity == DateGran.TIME)
|
||||
{
|
||||
if (calendar == null)
|
||||
return null;
|
||||
localCalendar = new GregorianCalendar();
|
||||
localCalendar.setTime(calendar.getTime());
|
||||
// Now set the UTC equivalent.
|
||||
calendar = new GregorianCalendar(utcZone);
|
||||
calendar.setTime(localCalendar.getTime());
|
||||
}
|
||||
else
|
||||
{
|
||||
// No Time component so just set the UTC date to be the same as the local Year, Month, and Day.
|
||||
calendar = new GregorianCalendar(localCalendar.get(Calendar.YEAR), localCalendar.get(Calendar.MONTH), localCalendar.get(Calendar.DAY_OF_MONTH));
|
||||
}
|
||||
return localCalendar;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a date from a Dublin Core value
|
||||
*
|
||||
* @param fromDC
|
||||
* the date string, in ISO 8601 (no timezone, always use UTC)
|
||||
*/
|
||||
public DCDate(String fromDC)
|
||||
{
|
||||
// An empty date is OK
|
||||
if ((fromDC == null) || fromDC.equals(""))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// default granularity
|
||||
granularity = DateGran.TIME;
|
||||
Date date = tryParse(fullIso, fromDC);
|
||||
if (date == null)
|
||||
date = tryParse(fullIso2, fromDC);
|
||||
if (date == null)
|
||||
date = tryParse(fullIso3, fromDC);
|
||||
if (date == null)
|
||||
date = tryParse(fullIso4, fromDC);
|
||||
if (date == null)
|
||||
{
|
||||
// Seems there is no time component to the date.
|
||||
date = tryParse(dateIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
granularity = DateGran.DAY;
|
||||
}
|
||||
}
|
||||
if (date == null)
|
||||
{
|
||||
date = tryParse(yearMonthIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
granularity = DateGran.MONTH;
|
||||
}
|
||||
}
|
||||
if (date == null)
|
||||
{
|
||||
date = tryParse(yearIso, fromDC);
|
||||
if (date != null)
|
||||
{
|
||||
granularity = DateGran.YEAR;
|
||||
}
|
||||
}
|
||||
|
||||
if (date == null)
|
||||
{
|
||||
log.warn("Mangled date: " + fromDC + " ..failed all attempts to parse as date.");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the UTC time.
|
||||
calendar = new GregorianCalendar(utcZone);
|
||||
calendar.setTime(date);
|
||||
|
||||
// Now set the local equivalent.
|
||||
if (granularity == DateGran.TIME)
|
||||
{
|
||||
localCalendar = new GregorianCalendar();
|
||||
localCalendar.setTime(date);
|
||||
}
|
||||
else
|
||||
{
|
||||
// No Time component so just set the local date to be the same as the UTC Year, Month, and Day.
|
||||
localCalendar = new GregorianCalendar(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Attempt to parse, swallowing errors; return null for failure.
|
||||
private synchronized Date tryParse(SimpleDateFormat sdf, String source)
|
||||
{
|
||||
try
|
||||
{
|
||||
return sdf.parse(source);
|
||||
}
|
||||
catch (ParseException pe)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the year, adjusting for current time zone.
|
||||
*
|
||||
@@ -391,9 +322,9 @@ public class DCDate
|
||||
*/
|
||||
public int getYear()
|
||||
{
|
||||
return ((getLocalCalendar() == null) || (!withinGranularity(DateGran.YEAR))) ? -1 : localCalendar.get(Calendar.YEAR);
|
||||
return (!withinGranularity(DateGran.YEAR)) ? -1 : localCalendar.get(Calendar.YEAR);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the month, adjusting for current time zone.
|
||||
*
|
||||
@@ -401,7 +332,7 @@ public class DCDate
|
||||
*/
|
||||
public int getMonth()
|
||||
{
|
||||
return ((getLocalCalendar() == null) || (!withinGranularity(DateGran.MONTH))) ? -1 : localCalendar.get(Calendar.MONTH) + 1;
|
||||
return (!withinGranularity(DateGran.MONTH)) ? -1 : localCalendar.get(Calendar.MONTH) + 1;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -411,7 +342,7 @@ public class DCDate
|
||||
*/
|
||||
public int getDay()
|
||||
{
|
||||
return ((getLocalCalendar() == null) || (!withinGranularity(DateGran.DAY))) ? -1 : localCalendar.get(Calendar.DAY_OF_MONTH);
|
||||
return (!withinGranularity(DateGran.DAY)) ? -1 : localCalendar.get(Calendar.DAY_OF_MONTH);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -421,7 +352,7 @@ public class DCDate
|
||||
*/
|
||||
public int getHour()
|
||||
{
|
||||
return getLocalCalendar() == null ? -1 : localCalendar.get(Calendar.HOUR_OF_DAY);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : localCalendar.get(Calendar.HOUR_OF_DAY);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -431,7 +362,7 @@ public class DCDate
|
||||
*/
|
||||
public int getMinute()
|
||||
{
|
||||
return getLocalCalendar() == null ? -1 : localCalendar.get(Calendar.MINUTE);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : localCalendar.get(Calendar.MINUTE);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -441,77 +372,254 @@ public class DCDate
|
||||
*/
|
||||
public int getSecond()
|
||||
{
|
||||
return getLocalCalendar() == null ? -1 : localCalendar.get(Calendar.SECOND);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : localCalendar.get(Calendar.SECOND);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the year in GMT.
|
||||
* Get the year in UTC.
|
||||
*
|
||||
* @return the year
|
||||
*/
|
||||
public int getYearGMT()
|
||||
public int getYearUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.YEAR);
|
||||
return (!withinGranularity(DateGran.YEAR)) ? -1 : calendar.get(Calendar.YEAR);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the month in GMT.
|
||||
* Get the month in UTC.
|
||||
*
|
||||
* @return the month
|
||||
*/
|
||||
public int getMonthGMT()
|
||||
public int getMonthUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.MONTH) + 1;
|
||||
return (!withinGranularity(DateGran.MONTH)) ? -1 : calendar.get(Calendar.MONTH) + 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the day in GMT.
|
||||
* Get the day in UTC.
|
||||
*
|
||||
* @return the day
|
||||
*/
|
||||
public int getDayGMT()
|
||||
public int getDayUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.DAY_OF_MONTH);
|
||||
return (!withinGranularity(DateGran.DAY)) ? -1 : calendar.get(Calendar.DAY_OF_MONTH);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the hour in GMT.
|
||||
* Get the hour in UTC.
|
||||
*
|
||||
* @return the hour
|
||||
*/
|
||||
public int getHourGMT()
|
||||
public int getHourUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.HOUR_OF_DAY);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : calendar.get(Calendar.HOUR_OF_DAY);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the minute in GMT.
|
||||
* Get the minute in UTC.
|
||||
*
|
||||
* @return the minute
|
||||
*/
|
||||
public int getMinuteGMT()
|
||||
public int getMinuteUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.MINUTE);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : calendar.get(Calendar.MINUTE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the second in GMT.
|
||||
* Get the second in UTC.
|
||||
*
|
||||
* @return the second
|
||||
*/
|
||||
public int getSecondGMT()
|
||||
public int getSecondUTC()
|
||||
{
|
||||
return calendar == null ? -1 : calendar.get(Calendar.SECOND);
|
||||
return (!withinGranularity(DateGran.TIME)) ? -1 : calendar.get(Calendar.SECOND);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the date as a string to put back in the Dublin Core. Use the UTC/GMT calendar version.
|
||||
*
|
||||
* @return The date as a string.
|
||||
*/
|
||||
public String toString()
|
||||
{
|
||||
if (calendar == null)
|
||||
return "null";
|
||||
return toStringInternal();
|
||||
}
|
||||
|
||||
private synchronized String toStringInternal()
|
||||
{
|
||||
if (granularity == DateGran.YEAR)
|
||||
return String.format("%4d", getYearUTC());
|
||||
else if (granularity == DateGran.MONTH)
|
||||
return String.format("%4d-%02d", getYearUTC(), getMonthUTC());
|
||||
else if (granularity == DateGran.DAY)
|
||||
return String.format("%4d-%02d-%02d", getYearUTC(), getMonthUTC(), getDayUTC());
|
||||
else
|
||||
return fullIso.format(calendar.getTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the date as a Java Date object.
|
||||
*
|
||||
* @return a Date object
|
||||
*/
|
||||
public Date toDate()
|
||||
{
|
||||
if (calendar == null)
|
||||
return null;
|
||||
else
|
||||
return calendar.getTime();
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a human-readable version of the DCDate, with optional time.
|
||||
* This needs to be in DCDate because it depends on the granularity of
|
||||
* the original time.
|
||||
*
|
||||
* FIXME: This should probably be replaced with a localized DateFormat.
|
||||
*
|
||||
* @param showTime
|
||||
* if true, display the time with the date
|
||||
* @param isLocalTime
|
||||
* if true, adjust for local time zone, otherwise UTC
|
||||
* @param locale
|
||||
* locale of the user
|
||||
*
|
||||
* @return String with the date in a human-readable form.
|
||||
*/
|
||||
public String displayDate(boolean showTime, boolean isLocalTime, Locale locale)
|
||||
{
|
||||
if (isLocalTime)
|
||||
{
|
||||
return displayLocalDate(showTime, locale);
|
||||
}
|
||||
else
|
||||
{
|
||||
return displayUTCDate(showTime, locale);
|
||||
}
|
||||
}
|
||||
|
||||
public String displayLocalDate(boolean showTime, Locale locale)
|
||||
{
|
||||
// forcibly truncate month name to 3 chars -- XXX FIXME?
|
||||
String monthName = getMonthName(getMonth(), locale).substring(0, 3);
|
||||
|
||||
// display date and time
|
||||
if (showTime && granularity == DateGran.TIME)
|
||||
{
|
||||
return String.format("%d-%s-%4d %02d:%02d:%02d", getDay(), monthName, getYear(), getHour(), getMinute(), getSecond());
|
||||
}
|
||||
else if (granularity == DateGran.YEAR)
|
||||
{
|
||||
return String.format("%4d", getYear());
|
||||
}
|
||||
else if (granularity == DateGran.MONTH)
|
||||
{
|
||||
return String.format("%s-%4d", monthName, getYear());
|
||||
}
|
||||
else
|
||||
{
|
||||
return String.format("%d-%s-%4d", getDay(), monthName, getYear());
|
||||
}
|
||||
}
|
||||
|
||||
public String displayUTCDate(boolean showTime, Locale locale)
|
||||
{
|
||||
// forcibly truncate month name to 3 chars -- XXX FIXME?
|
||||
String monthName = getMonthName(getMonthUTC(), locale).substring(0, 3);
|
||||
|
||||
// display date and time
|
||||
if (showTime && granularity == DateGran.TIME)
|
||||
{
|
||||
return String.format("%d-%s-%4d %02d:%02d:%02d", getDayUTC(), monthName, getYearUTC(), getHourUTC(), getMinuteUTC(), getSecondUTC());
|
||||
}
|
||||
else if (granularity == DateGran.YEAR)
|
||||
{
|
||||
return String.format("%4d", getYearUTC());
|
||||
}
|
||||
else if (granularity == DateGran.MONTH)
|
||||
{
|
||||
return String.format("%s-%4d", monthName, getYearUTC());
|
||||
}
|
||||
else
|
||||
{
|
||||
return String.format("%d-%s-%4d", getDayUTC(), monthName, getYearUTC());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test if the requested level of granularity is within that of the date.
|
||||
*
|
||||
* @param dg
|
||||
* The requested level of granularity.
|
||||
* @return
|
||||
* true or false.
|
||||
*
|
||||
*/
|
||||
private boolean withinGranularity(DateGran dg)
|
||||
{
|
||||
if (granularity == DateGran.TIME)
|
||||
{
|
||||
if ((dg == DateGran.TIME) || (dg == DateGran.DAY) || (dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.DAY)
|
||||
{
|
||||
if ((dg == DateGran.DAY) || (dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.MONTH)
|
||||
{
|
||||
if ((dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.YEAR)
|
||||
{
|
||||
if (dg == DateGran.YEAR)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/************** Some utility methods ******************/
|
||||
|
||||
/**
|
||||
* Get a date representing the current instant in time.
|
||||
*
|
||||
* @return a DSpaceDate object representing the current instant.
|
||||
|
||||
*/
|
||||
public static DCDate getCurrent()
|
||||
{
|
||||
return (new DCDate(new Date()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a month's name for a month between 1 and 12. Any invalid month value
|
||||
* (e.g. 0 or -1) will return a value of "Unspecified".
|
||||
*
|
||||
* @param m
|
||||
* the month number
|
||||
*
|
||||
* @return the month name.
|
||||
* @param locale
|
||||
*
|
||||
* @return the month name.
|
||||
*/
|
||||
public static String getMonthName(int m, Locale locale)
|
||||
{
|
||||
@@ -531,178 +639,4 @@ public class DCDate
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Test if the requested level of granularity is within that of the date.
|
||||
*
|
||||
* @param dg
|
||||
* The requested level of granularity.
|
||||
* @return
|
||||
* true or false.
|
||||
*
|
||||
*/
|
||||
private boolean withinGranularity(DateGran dg)
|
||||
{
|
||||
if (granularity == DateGran.TIME)
|
||||
{
|
||||
if ((dg == DateGran.TIME) || (dg == DateGran.DAY) || (dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.DAY)
|
||||
{
|
||||
if ((dg == DateGran.DAY) || (dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.MONTH)
|
||||
{
|
||||
if ((dg == DateGran.MONTH) || (dg == DateGran.YEAR))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (granularity == DateGran.YEAR)
|
||||
{
|
||||
if (dg == DateGran.YEAR)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple test program
|
||||
* Usage: java org.dspace.content.DCdate [DCDate | -l yyyy [mm [dd ..]]] ]
|
||||
* where "DCDate" is the kind of value that would be in metadata,
|
||||
* e.g. "2006", "2006-02-03", etc.
|
||||
* (-l form tests local time parsing)
|
||||
* Default is to use current time.
|
||||
*/
|
||||
public static void main(String args[])
|
||||
throws Exception
|
||||
{
|
||||
DCDate d;
|
||||
|
||||
// if there's an arg, parse it for the date, otherwise use now
|
||||
if (args.length > 0)
|
||||
{
|
||||
if (args[0].equals("-l"))
|
||||
{
|
||||
int val[] = { -1, -1, -1, -1, -1, -1 };
|
||||
for (int i = 1; i < 7 && i < args.length; ++i)
|
||||
val[i-1] = Integer.parseInt(args[i]);
|
||||
d = new DCDate();
|
||||
d.setDateLocal(val[0], val[1], val[2], val[3], val[4], val[5]);
|
||||
}
|
||||
else
|
||||
d = new DCDate(args[0]);
|
||||
}
|
||||
else
|
||||
d = DCDate.getCurrent();
|
||||
|
||||
// display results:
|
||||
System.out.println("toString() = \""+d.toString()+"\"");
|
||||
System.out.println("toDate().toString() = \""+d.toDate().toString()+"\"");
|
||||
System.out.println("\ndisplayDate(time=F,loc=F) = \""+d.displayDate(false, false, I18nUtil.DEFAULTLOCALE)+"\"");
|
||||
System.out.println("displayDate(time=T,loc=F) = \""+d.displayDate(true, false, I18nUtil.DEFAULTLOCALE)+"\"");
|
||||
System.out.println("displayDate(time=F,loc=T) = \""+d.displayDate(false, true, I18nUtil.DEFAULTLOCALE)+"\"");
|
||||
System.out.println("displayDate(time=T,loc=T) = \""+d.displayDate(true, true, I18nUtil.DEFAULTLOCALE)+"\"");
|
||||
|
||||
System.out.println("By component:");
|
||||
System.out.println("granularity = "+d.granularity);
|
||||
System.out.println("getYear(), = "+d.getYear());
|
||||
System.out.println("getMonth(), = "+d.getMonth());
|
||||
System.out.println("getDay(), = "+d.getDay());
|
||||
System.out.println("getHour(), = "+d.getHour());
|
||||
System.out.println("getMinute(), = "+d.getMinute());
|
||||
System.out.println("getSecond()); = "+d.getSecond());
|
||||
System.out.println("By GMT component:");
|
||||
System.out.println("getYearGMT(), = "+d.getYearGMT());
|
||||
System.out.println("getMonthGMT(), = "+d.getMonthGMT());
|
||||
System.out.println("getDayGMT(), = "+d.getDayGMT());
|
||||
System.out.println("getHourGMT(), = "+d.getHourGMT());
|
||||
System.out.println("getMinuteGMT(), = "+d.getMinuteGMT());
|
||||
System.out.println("getSecondGMT()); = "+d.getSecondGMT());
|
||||
|
||||
// convert it the hard way:
|
||||
DCDate hw = new DCDate();
|
||||
hw.setDateLocal(d.getYear(),d.getMonth(),d.getDay(),
|
||||
d.getHour(),d.getMinute(),d.getSecond());
|
||||
System.out.println("hardway.toString() = \""+hw.toString()+"\"");
|
||||
|
||||
// month str
|
||||
System.out.println("Month Name = \""+DCDate.getMonthName(d.getMonth(), Locale.getDefault())+"\"");
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a human-readable version of the DCDate, with optional time.
|
||||
* This needs to be in DCDate because it depends on the granularity of
|
||||
* the original time.
|
||||
*
|
||||
* FIXME: This should probably be replaced with a localized DateFormat.
|
||||
*
|
||||
* @param showTime
|
||||
* if true, display the time with the date
|
||||
* @param isLocalTime
|
||||
* if true, adjust for local time zone, otherwise GMT
|
||||
* @param locale
|
||||
* locale of the user
|
||||
*
|
||||
* @return String with the date in a human-readable form.
|
||||
*/
|
||||
public String displayDate(boolean showTime, boolean isLocalTime, Locale locale)
|
||||
{
|
||||
// if we are only showing day of a DCDate with time granularity,
|
||||
// create a temporary DCDate with date granularity so getDay() etc work.
|
||||
DCDate dd = this;
|
||||
if (!showTime && granularity == DateGran.TIME)
|
||||
{
|
||||
dd = new DCDate();
|
||||
dd.setDateLocal(getYearGMT(), getMonthGMT(), getDayGMT(), -1, -1, -1);
|
||||
}
|
||||
|
||||
// forcibly truncate month name to 3 chars -- XXX FIXME?
|
||||
String monthName = DCDate.getMonthName(dd.getMonth(), locale);
|
||||
if (monthName.length() > 2)
|
||||
monthName = monthName.substring(0, 3);
|
||||
|
||||
// display date and time
|
||||
if (showTime && granularity == DateGran.TIME)
|
||||
{
|
||||
if (isLocalTime)
|
||||
{
|
||||
return String.format("%d-%s-%4d %02d:%02d:%02d",
|
||||
dd.getDay(), monthName, dd.getYear(),
|
||||
dd.getHour(), dd.getMinute(), dd.getSecond());
|
||||
}
|
||||
else
|
||||
{
|
||||
monthName = DCDate.getMonthName(dd.getMonthGMT(), locale);
|
||||
if (monthName.length() > 2)
|
||||
monthName = monthName.substring(0, 3);
|
||||
return String.format("%d-%s-%4d %02d:%02d:%02d",
|
||||
dd.getDayGMT(), monthName, dd.getYearGMT(),
|
||||
dd.getHourGMT(), dd.getMinuteGMT(), dd.getSecondGMT());
|
||||
}
|
||||
}
|
||||
else if (granularity == DateGran.YEAR)
|
||||
{
|
||||
return String.format("%4d", dd.getYear());
|
||||
}
|
||||
else if (granularity == DateGran.MONTH)
|
||||
{
|
||||
return String.format("%s-%4d", monthName, dd.getYear());
|
||||
}
|
||||
else
|
||||
{
|
||||
return String.format("%d-%s-%4d", dd.getDay(), monthName, dd.getYear());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user