You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2012/01/20 18:05:07 UTC
svn commit: r1234004 - in /tika/trunk/tika-core/src:
main/java/org/apache/tika/metadata/Metadata.java
test/java/org/apache/tika/metadata/TestMetadata.java
Author: nick
Date: Fri Jan 20 17:05:06 2012
New Revision: 1234004
URL: http://svn.apache.org/viewvc?rev=1234004&view=rev
Log:
TIKA-843 Switch dates without times to noon UTC
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java
tika/trunk/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java?rev=1234004&r1=1234003&r2=1234004&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java Fri Jan 20 17:05:06 2012
@@ -68,9 +68,9 @@ public class Metadata implements Creativ
createDateFormat("yyyy-MM-dd' 'HH:mm:ss'Z'", "UTC"), // UTC/Zulu
createDateFormat("yyyy-MM-dd' 'HH:mm:ssZ", null), // With timezone
createDateFormat("yyyy-MM-dd' 'HH:mm:ss", null), // Without timezone
- // Date without time, set to Midnight UTC
- createDateFormat("yyyy-MM-dd", "UTC"), // Normal date format
- createDateFormat("yyyy:MM:dd", "UTC"), // Image (IPTC/EXIF) format
+ // Date without time, set to Midday UTC
+ createDateFormat("yyyy-MM-dd", "GMT-12:00"), // Normal date format
+ createDateFormat("yyyy:MM:dd", "GMT-12:00"), // Image (IPTC/EXIF) format
};
private static DateFormat createDateFormat(String format, String timezone) {
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java?rev=1234004&r1=1234003&r2=1234004&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/metadata/TestMetadata.java Fri Jan 20 17:05:06 2012
@@ -253,6 +253,7 @@ public class TestMetadata extends TestCa
*/
public void testGetSetDate() {
Metadata meta = new Metadata();
+ long hour = 60 * 60 * 1000;
// Isn't initially set, will get null back
assertEquals(null, meta.get(Metadata.CREATION_DATE));
@@ -309,12 +310,12 @@ public class TestMetadata extends TestCa
meta.set(Metadata.CREATION_DATE, "1969-12-31T12:00:01-12:00");
assertEquals(1000, meta.getDate(Metadata.CREATION_DATE).getTime());
- // Dates without times
+ // Dates without times, come in at midday UTC
meta.set(Metadata.CREATION_DATE, "1970-01-01");
- assertEquals(0, meta.getDate(Metadata.CREATION_DATE).getTime());
+ assertEquals(12*hour, meta.getDate(Metadata.CREATION_DATE).getTime());
meta.set(Metadata.CREATION_DATE, "1970:01:01");
- assertEquals(0, meta.getDate(Metadata.CREATION_DATE).getTime());
+ assertEquals(12*hour, meta.getDate(Metadata.CREATION_DATE).getTime());
}
/**