You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2019/08/12 17:42:59 UTC
[tika] branch master updated: Fix for TIKA-2922 contributed by
pascal.essiembre (#279)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new cc43b27 Fix for TIKA-2922 contributed by pascal.essiembre (#279)
cc43b27 is described below
commit cc43b276b60b1aabe01a2126363348db5a4d1888
Author: Pascal Essiembre <pa...@norconex.com>
AuthorDate: Mon Aug 12 13:40:20 2019 -0400
Fix for TIKA-2922 contributed by pascal.essiembre (#279)
---
.../org/apache/tika/parser/pkg/StreamingZipContainerDetector.java | 1 +
.../java/org/apache/tika/parser/pkg/ZipContainerDetectorBase.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/StreamingZipContainerDetector.java b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/StreamingZipContainerDetector.java
index 8de17de..ac4b6e6 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/StreamingZipContainerDetector.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/StreamingZipContainerDetector.java
@@ -57,6 +57,7 @@ public class StreamingZipContainerDetector extends ZipContainerDetectorBase impl
OOXML_CONTENT_TYPES.put(XSSFRelation.XLSB_BINARY_WORKBOOK.getContentType(), XLSB);
OOXML_CONTENT_TYPES.put(XSSFRelation.TEMPLATE_WORKBOOK.getContentType(), XLTX);
OOXML_CONTENT_TYPES.put(XSSFRelation.MACRO_TEMPLATE_WORKBOOK.getContentType(), XLTM);
+ OOXML_CONTENT_TYPES.put(XSSFRelation.MACRO_ADDIN_WORKBOOK.getContentType(), XLAM);
OOXML_CONTENT_TYPES.put(XSLFRelation.MAIN.getContentType(), PPTX);
OOXML_CONTENT_TYPES.put(XSLFRelation.MACRO.getContentType(), PPSM);
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetectorBase.java b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetectorBase.java
index 5595c42..a033d33 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetectorBase.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetectorBase.java
@@ -35,7 +35,7 @@ abstract class ZipContainerDetectorBase {
static final MediaType DOTM =
MediaType.application("vnd.ms-word.template.macroenabled.12");
static final MediaType DOTX =
- MediaType.application("vnd.ms-word.document.macroEnabled.12");
+ MediaType.application("vnd.openxmlformats-officedocument.wordprocessingml.template");
static final MediaType PPTX =
MediaType.application("vnd.openxmlformats-officedocument.presentationml.presentation");
static final MediaType PPSM =
@@ -60,6 +60,8 @@ abstract class ZipContainerDetectorBase {
MediaType.application("vnd.ms-excel.template.macroenabled.12");
static final MediaType XLTX =
MediaType.application("vnd.openxmlformats-officedocument.spreadsheetml.template");
+ static final MediaType XLAM =
+ MediaType.application("vnd.ms-excel.addin.macroEnabled.12");
static final MediaType XPS =
MediaType.application("vnd.ms-xpsdocument");