From 687f7c56cb16f95f6d957b485580b12c96fe484e Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Tue, 4 Feb 2020 22:55:58 -0500
Subject: [PATCH] 6036: reduce cache processing time. Ignore associated objects
 and minor change along with TSK change to get data source faster

---
 .../textextractors/ArtifactTextExtractor.java        | 12 +-----------
 .../autopsy/keywordsearch/SolrSearchService.java     |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/ArtifactTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/ArtifactTextExtractor.java
index ff806845f1..43c0112f1a 100644
--- a/Core/src/org/sleuthkit/autopsy/textextractors/ArtifactTextExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/textextractors/ArtifactTextExtractor.java
@@ -46,16 +46,6 @@ class ArtifactTextExtractor implements TextExtractor {
         // "content" string to be indexed.
         StringBuilder artifactContents = new StringBuilder();
 
-        Content dataSource = null;
-        try {
-            dataSource = artifact.getDataSource();
-        } catch (TskCoreException tskCoreException) {
-            throw new InitReaderException("Unable to get datasource for artifact: " + artifact.toString(), tskCoreException);
-        }
-        if (dataSource == null) {
-            throw new InitReaderException("Datasource was null for artifact: " + artifact.toString());
-        }
-
         try {
             for (BlackboardAttribute attribute : artifact.getAttributes()) {
                 artifactContents.append(attribute.getAttributeType().getDisplayName());
@@ -67,7 +57,7 @@ class ArtifactTextExtractor implements TextExtractor {
                 // in the Autopsy datamodel.
                 switch (attribute.getValueType()) {
                     case DATETIME:
-                        artifactContents.append(ContentUtils.getStringTime(attribute.getValueLong(), dataSource));
+                        artifactContents.append(ContentUtils.getStringTime(attribute.getValueLong(), artifact));
                         break;
                     default:
                         artifactContents.append(attribute.getDisplayString());
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
index 94dd567c5e..daaccc91ce 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
@@ -457,7 +457,8 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
     @Subscribe
     void handleNewArtifacts(Blackboard.ArtifactsPostedEvent event) {
         for (BlackboardArtifact artifact : event.getArtifacts()) {
-            if (artifact.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) { //don't index KWH artifacts.
+            if ((artifact.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) && // don't index KWH bc it's based on existing indexed text
+                    (artifact.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_ASSOCIATED_OBJECT.getTypeID())){ //don't index AO bc it has only an artifact ID - no useful text 
                 try {
                     index(artifact);
                 } catch (TskCoreException ex) {