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 2020/08/13 14:35:55 UTC
[tika] 09/10: TIKA-3161 -- extract macros from open document formats
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 7185612f337779cae697905d3e72957b9be279aa
Author: tallison <ta...@apache.org>
AuthorDate: Thu Aug 13 10:15:16 2020 -0400
TIKA-3161 -- extract macros from open document formats
# Conflicts:
# tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java
---
.../apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java | 2 +-
.../test/java/org/apache/tika/parser/odf/ODFParserTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java b/tika-parsers/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
index 6c83ea3..91ef3be 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
@@ -102,7 +102,7 @@ class FlatOpenDocumentMacroHandler extends ContentHandlerDecorator {
}
Metadata embeddedMetadata = new Metadata();
if (! StringUtils.isBlank(macroName)) {
- embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, macroName);
+ embeddedMetadata.set(Metadata.RESOURCE_NAME_KEY, macroName);
}
embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE,
TikaCoreProperties.EmbeddedResourceType.MACRO.toString());
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index 170d2b6..719aae5 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -462,12 +462,12 @@ public class ODFParserTest extends TikaTest {
Metadata macro1 = metadataList.get(1);
assertEquals("MACRO", macro1.get(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE_KEY));
assertContains("If WsGQFM Or 2 Then", macro1.get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT));
- assertEquals("test", macro1.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+ assertEquals("test", macro1.get(Metadata.RESOURCE_NAME_KEY));
Metadata macro2 = metadataList.get(2);
assertEquals("MACRO", macro2.get(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE_KEY));
assertContains("If WsGQFM Or 1 Then", macro2.get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT));
- assertEquals("test2", macro2.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+ assertEquals("test2", macro2.get(Metadata.RESOURCE_NAME_KEY));
Metadata image = metadataList.get(3);
assertEquals("image/png", image.get(Metadata.CONTENT_TYPE));
@@ -504,7 +504,7 @@ public class ODFParserTest extends TikaTest {
Metadata macro = metadataList.get(1);
assertEquals("MACRO", macro.get(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE_KEY));
assertContains("If WsGQFM Or 2 Then", macro.get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT));
- assertEquals("test1", macro.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+ assertEquals("test1", macro.get(Metadata.RESOURCE_NAME_KEY));
Metadata image = metadataList.get(2);
assertEquals("image/png", image.get(Metadata.CONTENT_TYPE));
@@ -529,8 +529,8 @@ public class ODFParserTest extends TikaTest {
Metadata macro = metadataList.get(1);
assertEquals("MACRO", macro.get(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE_KEY));
assertContains("If WsGQFM Or 2 Then", macro.get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT));
- assertEquals("testmodule", macro.get(TikaCoreProperties.RESOURCE_NAME_KEY));
- assertEquals("testmodule", macro.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+ assertEquals("testmodule", macro.get(Metadata.RESOURCE_NAME_KEY));
+ assertEquals("testmodule", macro.get(Metadata.RESOURCE_NAME_KEY));
}