From 069c239d0100b15e0b6d74e9d0487cf5aee7bf8e Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 26 Mar 2013 11:14:14 -0400
Subject: [PATCH] relax string extraction supported formats to be everything
 other than archives

---
 .../keywordsearch/AbstractFileStringExtract.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 2fe4f3e63f..66c5f49944 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -183,20 +183,12 @@ class AbstractFileStringExtract implements AbstractFileExtract {
         if (detectedFormat == null) {
             return true;
         }
-        else if (detectedFormat.equals("application/octet-stream")) {
-            //any binary unstructured blobs (string extraction will be used)
-            return true;
-        }
-        else if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
+
+        //accept everything other than archives
+        if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
             return false; //let unzipper take care of it
         }
-        //skip images/video/audio
-        else if (detectedFormat.contains("image/")
-                || detectedFormat.contains("audio/")
-                || detectedFormat.contains("video/")
-                ) {
-            return false;
-        }
+
         else {
             return true;
         }