Author: nick
Date: Wed Jan 7 11:53:27 2015
New Revision: 1650042
URL: http://svn.apache.org/r1650042
Log:
Shorten the ParseContext fetching of the TesseractOCRConfig
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java?rev=1650042&r1=1650041&r2=1650042&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
Wed Jan 7 11:53:27 2015
@@ -69,10 +69,9 @@ import org.xml.sax.SAXException;
*
*/
public class TesseractOCRParser extends AbstractParser {
-
- private static final long serialVersionUID = 1L;
-
+ private static final long serialVersionUID = -8167538283213097265L;
private static final Set<MediaType> SUPPORTED_TYPES = getTypes();
+ private static final TesseractOCRConfig DEFAULT_CONFIG = new
TesseractOCRConfig();
private static Set<MediaType> getTypes() {
HashSet<MediaType> supportedTypes = new HashSet<MediaType>();
@@ -132,9 +131,7 @@ public class TesseractOCRParser extends
public void parse(InputStream stream, ContentHandler handler, Metadata
metadata, ParseContext context)
throws IOException, SAXException, TikaException {
- TesseractOCRConfig config = context.get(TesseractOCRConfig.class);
- if (config == null)
- config = new TesseractOCRConfig();
+ TesseractOCRConfig config = context.get(TesseractOCRConfig.class,
DEFAULT_CONFIG);
String[] checkCmd = { config.getTesseractPath() + getTesseractProg() };
// If Tesseract is not on the path, do not try to run OCR.
