diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties index b94b04069b..9ca1203be4 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties @@ -8,7 +8,7 @@ MultiCaseKeywordSearchPanel.exactRadioButton.text_1=Exact Match MultiCaseKeywordSearchPanel.substringRadioButton.text_1=Substring Match MultiCaseKeywordSearchPanel.regexRadioButton.text_1=Regular Expression MultiCaseKeywordSearchPanel.keywordTextField.text_1= -MultiCaseKeywordSearchPanel.toolDescriptionTextArea.text=Perform a keyword search on the selected collections to find cases which contain hits. The cases can be opened to examine the results more closely. +MultiCaseKeywordSearchPanel.toolDescriptionTextArea.text=Perform a keyword search on the selected cases. The case can be opened to examine the results more closely. MultiCaseKeywordSearchPanel.casesLabel.text_1=Cases MultiCaseKeywordSearchPanel.resultsLabel.text=Results MultiCaseKeywordSearchPanel.uncheckButton.text=Uncheck All diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED index cbb81b3e99..d10f80b39a 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED @@ -89,7 +89,7 @@ MultiCaseKeywordSearchPanel.exactRadioButton.text_1=Exact Match MultiCaseKeywordSearchPanel.substringRadioButton.text_1=Substring Match MultiCaseKeywordSearchPanel.regexRadioButton.text_1=Regular Expression MultiCaseKeywordSearchPanel.keywordTextField.text_1= -MultiCaseKeywordSearchPanel.toolDescriptionTextArea.text=Perform a keyword search on the selected collections to find cases which contain hits. The cases can be opened to examine the results more closely. +MultiCaseKeywordSearchPanel.toolDescriptionTextArea.text=Perform a keyword search on the selected cases. The case can be opened to examine the results more closely. MultiCaseKeywordSearchPanel.casesLabel.text_1=Cases MultiCaseKeywordSearchPanel.resultsLabel.text=Results MultiCaseKeywordSearchPanel.uncheckButton.text=Uncheck All diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java index e391a9de22..b26001a28e 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java @@ -71,6 +71,7 @@ import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.CaseDbConnectionInfo; import org.sleuthkit.datamodel.Content; +import org.sleuthkit.datamodel.Report; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; import org.w3c.dom.Document; @@ -534,7 +535,7 @@ final class MultiCaseSearcher { final String caseDirectoryPath = caseMetadata.getCaseDirectory(); final Content content = caseDatabase.getContentById(objectId); final Content dataSource = content.getDataSource(); - final String dataSourceName = dataSource.getName(); + final String dataSourceName = (dataSource == null) ? "" : dataSource.getName(); SearchHit.SourceType sourceType = SearchHit.SourceType.FILE; String sourceName = ""; String sourcePath = ""; @@ -564,7 +565,13 @@ final class MultiCaseSearcher { } else { sourcePath = source.getUniquePath(); } + } else if (content instanceof Report) { + Report report = (Report) content; + sourceType = SearchHit.SourceType.REPORT; + sourceName = report.getReportName(); + sourcePath = report.getUniquePath(); } + return new SearchHit(caseDisplayName, caseDirectoryPath, dataSourceName, sourceType, sourceName, sourcePath); } catch (SQLException | TskCoreException ex) { throw new MultiCaseSearcherException(Bundle.MultiCaseSearcher_exceptionMessage_hitProcessingError(solrObjectId, caseInfo.getCaseMetadata().getCaseName(), caseInfo.getCaseMetadata().getCaseDirectory()), ex);