From 40b3a52f92b2515fe72df72f0230a4290081fa0e Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Wed, 8 Mar 2017 14:14:23 +0100
Subject: [PATCH 1/2] save hits even if we never get a snippet

---
 .../autopsy/keywordsearch/QueryResults.java      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
index 8d47831dba..eeb7b6dfaa 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
@@ -149,16 +149,14 @@ class QueryResults {
                         continue;
                     }
                 }
-                if (snippet != null) {
-                    KeywordCachedArtifact writeResult = keywordSearchQuery.writeSingleFileHitsToBlackBoard(keyword, hit, snippet, keywordList.getName());
-                    if (writeResult != null) {
-                        newArtifacts.add(writeResult.getArtifact());
-                        if (notifyInbox) {
-                            writeSingleFileInboxMessage(writeResult, hit.getContent());
-                        }
-                    } else {
-                        logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hit.getContent(), keyword.toString()}); //NON-NLS
+                KeywordCachedArtifact writeResult = keywordSearchQuery.writeSingleFileHitsToBlackBoard(keyword, hit, snippet, keywordList.getName());
+                if (writeResult != null) {
+                    newArtifacts.add(writeResult.getArtifact());
+                    if (notifyInbox) {
+                        writeSingleFileInboxMessage(writeResult, hit.getContent());
                     }
+                } else {
+                    logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hit.getContent(), keyword.toString()}); //NON-NLS
                 }
             }
             ++unitProgress;

From 6fa88eb1327b83fc2335e2a6323631f0c24c93b8 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Thu, 9 Mar 2017 10:51:25 +0100
Subject: [PATCH 2/2] improve comment about snippet queries

---
 .../org/sleuthkit/autopsy/keywordsearch/QueryResults.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
index eeb7b6dfaa..084e823bd3 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
@@ -138,7 +138,11 @@ class QueryResults {
                 if (StringUtils.isBlank(snippet)) {
                     final String snippetQuery = KeywordSearchUtil.escapeLuceneQuery(termString);
                     try {
-                        //this doesn't work for regex queries...
+                        /*
+                         * this doesn't work for regex queries... But that is
+                         * okay because regex queries always have snippets made
+                         * from the content_str field we pull back from Solr
+                         */
                         snippet = LuceneQuery.querySnippet(snippetQuery, hit.getSolrObjectId(), hit.getChunkId(), !keywordSearchQuery.isLiteral(), true);
                     } catch (NoOpenCoreException e) {
                         logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS