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 2019/07/18 13:40:50 UTC
[tika] branch master updated (03fa48a -> 477a8ca)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 03fa48a TIKA-2899 -- prevent non-aligned tags in xhtml output, take 2; see 658656.rtf
new 47d5d13 improve logging in tika-eval's results reporter
new 477a8ca TIKA-2908 -- reorder closing of streams in tesseract parser
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/tika/eval/reports/ResultsReporter.java | 2 ++
.../org/apache/tika/parser/ocr/TesseractOCRParser.java | 17 +++++++----------
2 files changed, 9 insertions(+), 10 deletions(-)
[tika] 01/02: improve logging in tika-eval's results reporter
Posted by ta...@apache.org.
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 47d5d13771eaf03805cfc9a3586395c08d62786e
Author: TALLISON <ta...@apache.org>
AuthorDate: Wed Jul 17 12:30:04 2019 -0400
improve logging in tika-eval's results reporter
---
.../src/main/java/org/apache/tika/eval/reports/ResultsReporter.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
index 11764dd..3ede4e6 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
@@ -299,12 +299,14 @@ public class ResultsReporter {
public void execute(Connection c, Path reportsDirectory) throws IOException, SQLException {
Statement st = c.createStatement();
for (String sql : before) {
+ LOG.info("processing before: {}", sql);
st.execute(sql);
}
for (Report r : reports) {
r.writeReport(c, reportsDirectory);
}
for (String sql : after) {
+ LOG.info("processing after: {}", sql);
st.execute(sql);
}
}
[tika] 02/02: TIKA-2908 -- reorder closing of streams in tesseract
parser
Posted by ta...@apache.org.
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 477a8cad63c455be195e4a75468cc3e162e67688
Author: TALLISON <ta...@apache.org>
AuthorDate: Thu Jul 18 09:19:57 2019 -0400
TIKA-2908 -- reorder closing of streams in tesseract parser
---
.../org/apache/tika/parser/ocr/TesseractOCRParser.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
index 5c6c517..655aaf8 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
@@ -61,6 +61,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.nio.charset.Charset;
@@ -236,23 +237,19 @@ public class TesseractOCRParser extends AbstractParser implements Initializable
public void parse(Image image, ContentHandler handler, Metadata metadata, ParseContext context) throws IOException,
SAXException, TikaException {
TemporaryResources tmp = new TemporaryResources();
- FileOutputStream fos = null;
- TikaInputStream tis = null;
try {
int w = image.getWidth(null);
int h = image.getHeight(null);
BufferedImage bImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
File file = tmp.createTemporaryFile();
- fos = new FileOutputStream(file);
- ImageIO.write(bImage, "png", fos);
- tis = TikaInputStream.get(file);
- parse(tis, handler, metadata, context);
+ try (OutputStream fos = new FileOutputStream(file)) {
+ ImageIO.write(bImage, "png", fos);
+ }
+ try (TikaInputStream tis = TikaInputStream.get(file)) {
+ parse(tis, handler, metadata, context);
+ }
} finally {
tmp.dispose();
- if (tis != null)
- tis.close();
- if (fos != null)
- fos.close();
}
}