You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2011/08/22 13:42:53 UTC
svn commit: r1160216 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
Author: maxcom
Date: Mon Aug 22 11:42:53 2011
New Revision: 1160216
URL: http://svn.apache.org/viewvc?rev=1160216&view=rev
Log:
TIKA-693 - Incorrect mime-type for .pptm, .ppsm and .ppsx in OOXMLParser
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java?rev=1160216&r1=1160215&r2=1160216&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java Mon Aug 22 11:42:53 2011
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
public class XSLFPowerPointExtractorDecorator extends AbstractOOXMLExtractor {
public XSLFPowerPointExtractorDecorator(ParseContext context, XSLFPowerPointExtractor extractor) {
- super(context, extractor, "application/vnd.openxmlformats-officedocument.presentationml.presentation");
+ super(context, extractor, null);
}
/**
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=1160216&r1=1160215&r2=1160216&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 Aug 22 11:42:53 2011
@@ -167,8 +167,18 @@ public class OOXMLParserTest extends Tes
//"thmx", // TIKA-418: Will be supported in POI 3.7 beta 2
//"xps" // TIKA-418: Not yet supported by POI
};
- for(String extension : extensions) {
- String filename = "testPPT." + extension;
+
+ String[] mimeTypes = new String[] {
+ "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "application/vnd.ms-powerpoint.presentation.macroenabled.12",
+ "application/vnd.ms-powerpoint.slideshow.macroenabled.12",
+ "application/vnd.openxmlformats-officedocument.presentationml.slideshow"
+ };
+
+ for (int i=0; i<extensions.length; i++) {
+ String extension = extensions[i];
+ String filename = "testPPT." + extension;
+
InputStream input = OOXMLParserTest.class
.getResourceAsStream("/test-documents/"+filename);
@@ -183,7 +193,8 @@ public class OOXMLParserTest extends Tes
parser.parse(input, handler, metadata, context);
assertEquals(
- "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "Mime-type checking for " + filename,
+ mimeTypes[i],
metadata.get(Metadata.CONTENT_TYPE));
assertEquals("Attachment Test", metadata.get(Metadata.TITLE));
assertEquals("Rajiv", metadata.get(Metadata.AUTHOR));