This commit is contained in:
Greg DiCristofaro 2021-12-16 17:33:55 -05:00
parent d3635d66ef
commit ff9a8c2f3f

View File

@ -359,10 +359,10 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
super(itemData.getSearchParams().getRegex(), super(itemData.getSearchParams().getRegex(),
getIconPath(BlackboardArtifact.Type.TSK_KEYWORD_HIT), getIconPath(BlackboardArtifact.Type.TSK_KEYWORD_HIT),
itemData, itemData,
(itemData.getSearchParams().hasChildren() || itemData.getSearchParams().getSearchType() == TskData.KeywordSearchQueryType.REGEX (itemData.getSearchParams().hasChildren() || itemData.getSearchParams().getSearchType() == TskData.KeywordSearchQueryType.REGEX
// for regex queries always create a subtree, even if there is only one child // for regex queries always create a subtree, even if there is only one child
? Children.create(new KeywordFoundMatchFactory(itemData.getSearchParams()), true) ? Children.create(new KeywordFoundMatchFactory(itemData.getSearchParams()), true)
: Children.LEAF), : Children.LEAF),
getDefaultLookup(itemData)); getDefaultLookup(itemData));
} }
@ -372,10 +372,12 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
if (!searchTermParams.hasChildren()) { if (!searchTermParams.hasChildren()) {
KeywordHitSearchParam searchParams = new KeywordHitSearchParam(searchTermParams.getDataSourceId(), KeywordHitSearchParam searchParams = new KeywordHitSearchParam(searchTermParams.getDataSourceId(),
searchTermParams.getSetName(), searchTermParams.getSetName(),
searchTermParams.getRegex(), // if literal, keyword is regex
null, TskData.KeywordSearchQueryType.LITERAL.equals(searchTermParams.getSearchType()) ? searchTermParams.getRegex() : null,
searchTermParams.getSearchType()); // if literal, no regex
TskData.KeywordSearchQueryType.LITERAL.equals(searchTermParams.getSearchType()) ? null : searchTermParams.getRegex(),
searchTermParams.getSearchType());
dataResultPanel.displayKeywordHits(searchParams); dataResultPanel.displayKeywordHits(searchParams);
} else { } else {
super.respondSelection(dataResultPanel); super.respondSelection(dataResultPanel);