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 2022/04/25 20:53:20 UTC
[tika] branch main updated: TIKA-3730
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 4639e8d37 TIKA-3730
4639e8d37 is described below
commit 4639e8d3712fa015bcecdb1e6b89e8bd9e5e67fa
Author: tallison <ta...@apache.org>
AuthorDate: Mon Apr 25 16:53:07 2022 -0400
TIKA-3730
---
.../org/apache/tika/parser/external2/ExternalParser.java | 15 ++++++---------
.../apache/tika/parser/external2/ExternalParserTest.java | 3 +++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tika-core/src/main/java/org/apache/tika/parser/external2/ExternalParser.java b/tika-core/src/main/java/org/apache/tika/parser/external2/ExternalParser.java
index 789ac4e42..ec53d29dd 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/external2/ExternalParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/external2/ExternalParser.java
@@ -68,11 +68,9 @@ public class ExternalParser extends AbstractParser implements Initializable {
public static final long DEFAULT_TIMEOUT_MS = 60000;
- public static final String INPUT_FILE_TOKEN =
- org.apache.tika.parser.external.ExternalParser.INPUT_FILE_TOKEN;
+ public static final String INPUT_FILE_TOKEN = "${INPUT_FILE}";
- public static final String OUTPUT_FILE_TOKEN =
- org.apache.tika.parser.external.ExternalParser.OUTPUT_FILE_TOKEN;
+ public static final String OUTPUT_FILE_TOKEN = "${OUTPUT_FILE}";
private static Pattern INPUT_TOKEN_MATCHER = Pattern.compile("\\$\\{INPUT_FILE}");
private static Pattern OUTPUT_TOKEN_MATCHER = Pattern.compile("\\$\\{OUTPUT_FILE}");
@@ -114,14 +112,13 @@ public class ExternalParser extends AbstractParser implements Initializable {
boolean outputFileInCommandline = false;
for (String c : commandLine) {
if (inputMatcher.reset(c).find()) {
- String updated =
- inputMatcher.replaceAll(ProcessUtils.escapeCommandLine(p.toAbsolutePath().toString()));
+ String updated = c.replace(INPUT_FILE_TOKEN,
+ ProcessUtils.escapeCommandLine(p.toAbsolutePath().toString()));
thisCommandLine.add(updated);
} else if (outputMatcher.reset(c).find()) {
outFile = Files.createTempFile("tika-external2-", "");
- String updated =
- outputMatcher.replaceAll(ProcessUtils.escapeCommandLine(
- outFile.toAbsolutePath().toString()));
+ String updated = c.replace(OUTPUT_FILE_TOKEN,
+ ProcessUtils.escapeCommandLine(outFile.toAbsolutePath().toString()));
thisCommandLine.add(updated);
outputFileInCommandline = true;
} else {
diff --git a/tika-core/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java b/tika-core/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java
index d4c389955..29d639c16 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java
@@ -22,6 +22,8 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
import org.xml.sax.ContentHandler;
@@ -36,6 +38,7 @@ import org.apache.tika.parser.CompositeParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.RegexCaptureParser;
+import org.apache.tika.utils.ProcessUtils;
public class ExternalParserTest extends TikaTest {