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
commit dad1c722ceb7b8583f878d5e5bba88325f5f3530 Author: TALLISON <[email protected]> AuthorDate: Fri Aug 16 12:52:09 2019 -0400 TIKA-2926 -- add property for container exception in RPW --- .../org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java | 3 ++- .../src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java | 2 +- .../org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java index 443950f..028acf5 100644 --- a/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java +++ b/tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java @@ -39,6 +39,7 @@ import org.apache.tika.parser.Parser; import org.apache.tika.parser.RecursiveParserWrapper; import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler; import org.apache.tika.sax.BasicContentHandlerFactory; +import org.apache.tika.sax.RecursiveParserWrapperHandler; import org.junit.Test; public class RecursiveParserWrapperFSConsumerTest extends TikaTest { @@ -130,7 +131,7 @@ public class RecursiveParserWrapperFSConsumerTest extends TikaTest { List<Metadata> results = JsonMetadataList.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), UTF_8)); assertEquals(2, results.size()); assertContains("another null pointer", - results.get(0).get(TikaCoreProperties.TIKA_META_EXCEPTION_PREFIX + "runtime")); + results.get(0).get(RecursiveParserWrapperHandler.CONTAINER_EXCEPTION)); assertEquals("Nikolai Lobachevsky", results.get(0).get("author")); assertEquals("embeddedAuthor", results.get(1).get("author")); assertContains("some_embedded_content", results.get(1).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT)); diff --git a/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java b/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java index 4e05d74..37ed63c 100644 --- a/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java +++ b/tika-core/src/main/java/org/apache/tika/parser/RecursiveParserWrapper.java @@ -241,7 +241,7 @@ public class RecursiveParserWrapper extends ParserDecorator { //try our best to record the problem in the metadata object //then rethrow String stackTrace = ExceptionUtils.getFilteredStackTrace(e); - metadata.add(TikaCoreProperties.TIKA_META_EXCEPTION_PREFIX+"runtime", stackTrace); + metadata.add(RecursiveParserWrapperHandler.CONTAINER_EXCEPTION, stackTrace); throw e; } finally { long elapsedMillis = System.currentTimeMillis() - started; diff --git a/tika-core/src/main/java/org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java b/tika-core/src/main/java/org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java index 8bdba65..c76080a 100644 --- a/tika-core/src/main/java/org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java +++ b/tika-core/src/main/java/org/apache/tika/sax/AbstractRecursiveParserWrapperHandler.java @@ -46,8 +46,11 @@ public abstract class AbstractRecursiveParserWrapperHandler extends DefaultHandl public final static Property EMBEDDED_RESOURCE_LIMIT_REACHED = Property.internalBoolean(TikaCoreProperties.TIKA_META_EXCEPTION_PREFIX + "embedded_resource_limit_reached"); + //exception in embedded file public final static Property EMBEDDED_EXCEPTION = ParserUtils.EMBEDDED_EXCEPTION; - + //exception in main file + public final static Property CONTAINER_EXCEPTION = Property.internalText( + TikaCoreProperties.TIKA_META_EXCEPTION_PREFIX+"runtime"); public final static Property EMBEDDED_RESOURCE_PATH = Property.internalText(TikaCoreProperties.TIKA_META_PREFIX+"embedded_resource_path");
