You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by rg...@apache.org on 2016/03/22 02:08:15 UTC
tika git commit: TIKA-1906: ExternalParser No Longer Supports
Commands in Array Format - Manual merge of
73aaa1bcee194e8fa73cb0c3cd60ae2eb3205bf9 from master
Repository: tika
Updated Branches:
refs/heads/2.x 41915dc3b -> cf9632388
TIKA-1906: ExternalParser No Longer Supports Commands in Array Format
- Manual merge of 73aaa1bcee194e8fa73cb0c3cd60ae2eb3205bf9 from
master
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/cf963238
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/cf963238
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/cf963238
Branch: refs/heads/2.x
Commit: cf963238803ca8fc4ce83fd383423b75b1b26619
Parents: 41915dc
Author: rgauss <rg...@apache.org>
Authored: Mon Mar 21 21:08:03 2016 -0400
Committer: rgauss <rg...@apache.org>
Committed: Mon Mar 21 21:08:03 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/tika/parser/external/ExternalParser.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/cf963238/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
index 1515de6..ab50f01 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
@@ -160,7 +160,13 @@ public class ExternalParser extends AbstractParser {
File output = null;
// Build our command
- String[] cmd = command[0].split(" ");
+ String[] cmd;
+ if (command.length == 1) {
+ cmd = command[0].split(" ");
+ } else {
+ cmd = new String[command.length];
+ System.arraycopy(command, 0, cmd, 0, command.length);
+ }
for(int i=0; i<cmd.length; i++) {
if(cmd[i].indexOf(INPUT_FILE_TOKEN) != -1) {
cmd[i] = cmd[i].replace(INPUT_FILE_TOKEN, stream.getFile().getPath());