diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java b/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java index d88c9f6f72..4b1b46b997 100755 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java @@ -50,7 +50,7 @@ public class TextExtractorFactory { * have no corresponding * extractor */ - public static TextExtractor getReader(Content file, + public static TextExtractor getExtractor(Content file, ExtractionContext context) throws NoTextExtractorFound { if (file instanceof AbstractFile) { String mimeType = ((AbstractFile) file).getMIMEType(); @@ -91,7 +91,7 @@ public class TextExtractorFactory { * * @return A DefaultExtractor instance */ - public static TextExtractor getDefaultReader(Content source, ExtractionContext context) { + public static TextExtractor getDefaultExtractor(Content source, ExtractionContext context) { StringsTextExtractor stringsInstance = new StringsTextExtractor(source); stringsInstance.setExtractionSettings(context); return stringsInstance; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 340e533eb0..edb9e12b86 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -486,7 +486,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule { extractionContext.set(ImageFileExtractionConfig.class, imageConfig); try { - Reader specializedReader = TextExtractorFactory.getReader(aFile,extractionContext).getReader(); + Reader specializedReader = TextExtractorFactory.getExtractor(aFile,extractionContext).getReader(); //divide into chunks and index return Ingester.getDefault().indexText(specializedReader,aFile.getId(),aFile.getName(), aFile, context); } catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) { @@ -508,7 +508,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule { if (context.fileIngestIsCancelled()) { return true; } - Reader stringsReader = TextExtractorFactory.getDefaultReader(aFile, stringsExtractionContext).getReader(); + Reader stringsReader = TextExtractorFactory.getDefaultExtractor(aFile, stringsExtractionContext).getReader(); if (Ingester.getDefault().indexText(stringsReader,aFile.getId(),aFile.getName(), aFile, KeywordSearchIngestModule.this.context)) { putIngestStatus(jobId, aFile.getId(), IngestStatus.STRINGS_INGESTED); return true; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java index 4d1694a424..ea178cd203 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java @@ -117,7 +117,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService { } try { Reader blackboardReader = TextExtractorFactory - .getReader(content, null).getReader(); + .getExtractor(content, null).getReader(); String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID(); ingester.indexMetaDataOnly(artifact, sourceName); ingester.indexText(blackboardReader, artifact.getArtifactID(), sourceName, content, null); @@ -127,12 +127,12 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService { } else { try { Reader contentReader = TextExtractorFactory - .getReader(content, null).getReader(); + .getExtractor(content, null).getReader(); ingester.indexText(contentReader, content.getId(), content.getName(), content, null); } catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException | Ingester.IngesterException ex) { try { // Try the StringsTextExtractor if Tika extractions fails. - ingester.indexText(TextExtractorFactory.getDefaultReader(content, null).getReader(),content.getId(),content.getName(), content, null); + ingester.indexText(TextExtractorFactory.getDefaultExtractor(content, null).getReader(),content.getId(),content.getName(), content, null); } catch (Ingester.IngesterException | InitReaderException ex1) { throw new TskCoreException(ex.getCause().getMessage(), ex1); } @@ -448,7 +448,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService { try { String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID(); Reader contentSpecificReader = - TextExtractorFactory.getReader((Content) artifact, null).getReader(); + TextExtractorFactory.getExtractor((Content) artifact, null).getReader(); ingester.indexMetaDataOnly(artifact, sourceName); ingester.indexText(contentSpecificReader, artifact.getId(), sourceName, artifact, null); } catch (Ingester.IngesterException | TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) {