Now throwing TikaException on unsupported QuattroPro format instead of logging a message, as suggested by Luis Filipe Nassif.
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/0de63a16 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/0de63a16 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/0de63a16 Branch: refs/heads/master Commit: 0de63a16686e88245f40bd2da65e8b0274889e4d Parents: 87c2ef3 Author: Pascal Essiembre <[email protected]> Authored: Tue Dec 20 23:21:27 2016 -0500 Committer: Pascal Essiembre <[email protected]> Committed: Tue Dec 20 23:21:27 2016 -0500 ---------------------------------------------------------------------- .../org/apache/tika/parser/wordperfect/QPWTextExtractor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/0de63a16/tika-parsers/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java index 2242001..7192120 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java @@ -23,6 +23,7 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.POIFSFileSystem; +import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.SAXException; @@ -165,15 +166,14 @@ public class QPWTextExtractor { @SuppressWarnings("resource") public void extract( InputStream input, XHTMLContentHandler xhtml, Metadata metadata) - throws IOException, SAXException { + throws IOException, SAXException, TikaException { POIFSFileSystem pfs = new POIFSFileSystem(input); DirectoryNode rootNode = pfs.getRoot(); if (rootNode == null || !rootNode.hasEntry(OLE_DOCUMENT_NAME)) { - LOG.info("Unsupported QuattroPro file format. " + throw new TikaException("Unsupported QuattroPro file format. " + "Looking for OLE entry \"" + OLE_DOCUMENT_NAME + "\". Found: "+ rootNode.getEntryNames()); - return; } //TODO shall we validate and throw warning/error if the file does not
