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 2016/11/01 15:09:08 UTC
tika git commit: TIKA-2111 - ExecutableParser should set rather than
add a Content-Type
Repository: tika
Updated Branches:
refs/heads/2.x 4b393a6f9 -> a6978521f
TIKA-2111 - ExecutableParser should set rather than add a Content-Type
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/a6978521
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/a6978521
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/a6978521
Branch: refs/heads/2.x
Commit: a6978521fb4c75195180d33734ceb23de8b6bd43
Parents: 4b393a6
Author: tballison <ta...@mitre.org>
Authored: Tue Nov 1 11:08:45 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Tue Nov 1 11:08:45 2016 -0400
----------------------------------------------------------------------
.../apache/tika/parser/executable/ExecutableParser.java | 12 ++++++------
.../tika/parser/executable/ExecutableParserTest.java | 4 +---
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/a6978521/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
index 5b3294e..cb63641 100644
--- a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
+++ b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
@@ -86,7 +86,7 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata
*/
public void parsePE(XHTMLContentHandler xhtml, Metadata metadata,
InputStream stream, byte[] first4) throws TikaException, IOException {
- metadata.add(Metadata.CONTENT_TYPE, PE_EXE.toString());
+ metadata.set(Metadata.CONTENT_TYPE, PE_EXE.toString());
metadata.set(PLATFORM, PLATFORM_WINDOWS);
// Skip over the MS-DOS bit
@@ -320,23 +320,23 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata
}
switch(type) {
case 1:
- metadata.add(Metadata.CONTENT_TYPE, ELF_OBJECT.toString());
+ metadata.set(Metadata.CONTENT_TYPE, ELF_OBJECT.toString());
break;
case 2:
- metadata.add(Metadata.CONTENT_TYPE, ELF_EXECUTABLE.toString());
+ metadata.set(Metadata.CONTENT_TYPE, ELF_EXECUTABLE.toString());
break;
case 3:
- metadata.add(Metadata.CONTENT_TYPE, ELF_SHAREDLIB.toString());
+ metadata.set(Metadata.CONTENT_TYPE, ELF_SHAREDLIB.toString());
break;
case 4:
- metadata.add(Metadata.CONTENT_TYPE, ELF_COREDUMP.toString());
+ metadata.set(Metadata.CONTENT_TYPE, ELF_COREDUMP.toString());
break;
default:
- metadata.add(Metadata.CONTENT_TYPE, ELF_GENERAL.toString());
+ metadata.set(Metadata.CONTENT_TYPE, ELF_GENERAL.toString());
break;
}
http://git-wip-us.apache.org/repos/asf/tika/blob/a6978521/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
index 859cc7d..a48143c 100644
--- a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
+++ b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
@@ -31,10 +31,8 @@ public class ExecutableParserTest extends TikaTest {
XMLResult r = getXML("testWindows-x86-32.exe");
Metadata metadata = r.metadata;
- //not clear why ExecutableParser is adding instead of
- //setting CONTENT_TYPE
assertContains("application/x-msdownload",
- Arrays.asList(metadata.getValues(Metadata.CONTENT_TYPE)));
+ metadata.get(Metadata.CONTENT_TYPE));
assertEquals("2012-05-13T13:40:11Z",
metadata.get(Metadata.CREATION_DATE));