From ff9a8c2f3fac1c301dc84d0b3df80537279ad3ee Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Thu, 16 Dec 2021 17:33:55 -0500
Subject: [PATCH] bug fix

---
 .../nodes/AnalysisResultTypeFactory.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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