Author: nick
Date: Fri Dec  2 12:17:53 2011
New Revision: 1209438

URL: http://svn.apache.org/viewvc?rev=1209438&view=rev
Log:
Patch+Test from Antoni from TIKA-797 - Correct the default PPT extension

Modified:
    
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
    
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java

Modified: 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1209438&r1=1209437&r2=1209438&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml 
(original)
+++ 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml 
Fri Dec  2 12:17:53 2011
@@ -1288,8 +1288,8 @@
          <match value="P\x00o\x00w\x00e\x00r\x00P\x00o\x00i\x00n\x00t\x00 
D\x00o\x00c\x00u\x00m\x00e\x00n\x00t" type="string" offset="1152:4096" />
       </match>
     </magic>
-    <glob pattern="*.ppz"/>
     <glob pattern="*.ppt"/>
+    <glob pattern="*.ppz"/>
     <glob pattern="*.pps"/>
     <glob pattern="*.pot"/>
     <glob pattern="*.ppa"/>

Modified: 
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java?rev=1209438&r1=1209437&r2=1209438&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
 (original)
+++ 
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
 Fri Dec  2 12:17:53 2011
@@ -162,5 +162,12 @@ public class MimeTypesReaderTest extends
           fail(e.getMessage());
        }
     }
+    
+    public void testGetExtensionForPowerPoint() throws Exception {
+        MimeType mt = this.mimeTypes.forName("application/vnd.ms-powerpoint");
+        String ext = mt.getExtension();
+        assertEquals(".ppt",ext);
+        assertEquals(".ppt",mt.getExtensions().get(0));
+    }
 
 }


Reply via email to