svn commit: r1367225 - in /tika/trunk: tika-core/src/main/java/org/apache/tika/metadata/ tika-parsers/src/test/java/org/apache/tika/parser/dwg/ tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ tika-parsers/src/test/java/org/apache/tika/pars...

Mon, 30 Jul 2012 12:00:33 -0700 

Author: rgauss
Date: Mon Jul 30 18:59:46 2012
New Revision: 1367225

URL: http://svn.apache.org/viewvc?rev=1367225&view=rev
Log:
TIKA-962: Backwards Compatibility for Metadata.LAST_AUTHOR is Broken
   - Added tests for backwards compatibility of Metadata.LAST_AUTHOR
   - Changed TikaCoreProperties.MODIFIER to be a composite property containing 
Metadata.LAST_AUTHOR

Modified:
    
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java

Modified: 
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java?rev=1367225&r1=1367224&r2=1367225&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java
 (original)
+++ 
tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/TikaCoreProperties.java
 Mon Jul 30 18:59:46 2012
@@ -73,7 +73,8 @@ public interface TikaCoreProperties {
     /**
      * @see Office#LAST_AUTHOR
      */
-     public static final Property MODIFIER = Office.LAST_AUTHOR;
+     public static final Property MODIFIER = 
Property.composite(Office.LAST_AUTHOR, 
+             new Property[] { Property.internalText(Metadata.LAST_AUTHOR) });
     
     /**
      * @see XMP#CREATOR_TOOL

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java?rev=1367225&r1=1367224&r2=1367225&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
 Mon Jul 30 18:59:46 2012
@@ -151,6 +151,8 @@ public class DWGParserTest extends TestC
                     metadata.get(TikaCoreProperties.COMMENTS));
             assertEquals("bejanpol",
                     metadata.get(TikaCoreProperties.MODIFIER));
+            assertEquals("bejanpol",
+                    metadata.get(Metadata.LAST_AUTHOR));
             assertEquals("http://mycompany/drawings";,
                     metadata.get(TikaCoreProperties.RELATION));
             assertEquals("MyCustomPropertyValue",

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java?rev=1367225&r1=1367224&r2=1367225&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
 Mon Jul 30 18:59:46 2012
@@ -206,6 +206,7 @@ public class PowerPointParserTest extend
        assertEquals("application/vnd.ms-powerpoint", 
metadata.get(Metadata.CONTENT_TYPE));
        assertEquals("JOUVIN ETIENNE",       
metadata.get(TikaCoreProperties.CREATOR));
        assertEquals("EJ04325S",             
metadata.get(TikaCoreProperties.MODIFIER));
+       assertEquals("EJ04325S",             
metadata.get(Metadata.LAST_AUTHOR));
        assertEquals("2011-08-22T13:32:58Z", 
metadata.get(TikaCoreProperties.MODIFIED));
        assertEquals("2011-08-22T13:30:53Z", 
metadata.get(TikaCoreProperties.CREATED));
        assertEquals("1",                    metadata.get(Office.SLIDE_COUNT));

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java?rev=1367225&r1=1367224&r2=1367225&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
 Mon Jul 30 18:59:46 2012
@@ -284,6 +284,7 @@ public class WordParserTest extends Tika
        assertEquals("application/msword",   
metadata.get(Metadata.CONTENT_TYPE));
        assertEquals("EJ04325S",             
metadata.get(TikaCoreProperties.CREATOR));
        assertEquals("Etienne Jouvin",       
metadata.get(TikaCoreProperties.MODIFIER));
+       assertEquals("Etienne Jouvin",       
metadata.get(Metadata.LAST_AUTHOR));
        assertEquals("2012-01-03T22:14:00Z", 
metadata.get(TikaCoreProperties.MODIFIED));
        assertEquals("2010-10-05T09:03:00Z", 
metadata.get(TikaCoreProperties.CREATED));
        assertEquals("Microsoft Office 
Word",metadata.get(OfficeOpenXMLExtended.APPLICATION));

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1367225&r1=1367224&r2=1367225&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
 Mon Jul 30 18:59:46 2012
@@ -773,6 +773,7 @@ public class OOXMLParserTest extends Tik
              metadata.get(Metadata.CONTENT_TYPE));
        assertEquals("EJ04325S",             
metadata.get(TikaCoreProperties.CREATOR));
        assertEquals("Etienne Jouvin",       
metadata.get(TikaCoreProperties.MODIFIER));
+       assertEquals("Etienne Jouvin",       
metadata.get(Metadata.LAST_AUTHOR));
        assertEquals("2011-07-29T16:52:00Z", 
metadata.get(TikaCoreProperties.CREATED));
        assertEquals("2012-01-03T22:14:00Z", 
metadata.get(TikaCoreProperties.MODIFIED));
        assertEquals("Microsoft Office 
Word",metadata.get(Metadata.APPLICATION_NAME));
@@ -812,6 +813,7 @@ public class OOXMLParserTest extends Tik
              metadata.get(Metadata.CONTENT_TYPE));
        assertEquals("JOUVIN ETIENNE",       
metadata.get(TikaCoreProperties.CREATOR));
        assertEquals("EJ04325S",             
metadata.get(TikaCoreProperties.MODIFIER));
+       assertEquals("EJ04325S",             
metadata.get(Metadata.LAST_AUTHOR));
        assertEquals("2011-08-22T13:30:53Z", 
metadata.get(TikaCoreProperties.CREATED));
        assertEquals("2011-08-22T13:32:49Z", 
metadata.get(TikaCoreProperties.MODIFIED));
        assertEquals("1",                    metadata.get(Office.SLIDE_COUNT));

Reply via email to