diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index fc4944a152..f988764412 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -614,8 +614,8 @@ class IngestMessagePanel extends javax.swing.JPanel {
continue;
}
b.append(details);
- //b.append("
");
b.append("
");
+ b.append("
");
}
return b.toString();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
index 9a73d96a18..0eab507bc6 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
@@ -80,7 +80,6 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
"gz", "tgz", "doc", "xls", "ppt", "rtf", "pdf", "html", "htm", "xhtml", "txt",
"bmp", "gif", "png", "jpeg", "tiff", "mp3", "aiff", "au", "midi", "wav",
"pst", "xml", "class"};
-
public enum IngestStatus {
@@ -104,7 +103,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
if (hashDBResult == IngestServiceFsContent.ProcessResult.COND_STOP) {
return ProcessResult.OK;
}
-
+
//check if time to commit and previous search is not running
//commiting while searching causes performance issues
if (commitIndex && searcherDone) {
@@ -122,7 +121,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
}
indexer.indexFile(fsContent);
return ProcessResult.OK;
-
+
}
@Override
@@ -231,27 +230,27 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
public boolean hasSimpleConfiguration() {
return true;
}
-
+
@Override
public boolean hasAdvancedConfiguration() {
return true;
}
-
+
@Override
public javax.swing.JPanel getSimpleConfiguration() {
return new KeywordSearchIngestSimplePanel();
}
-
+
@Override
public javax.swing.JPanel getAdvancedConfiguration() {
return KeywordSearchConfigurationPanel.getDefault();
}
-
+
@Override
public void saveAdvancedConfiguration() {
KeywordSearchConfigurationPanel.getDefault().editListPanel.save();
}
-
+
@Override
public void saveSimpleConfiguration() {
}
@@ -567,7 +566,12 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
StringBuilder detailsSb = new StringBuilder();
//final int hitFiles = newResults.size();
- subjectSb.append("Keyword hit: ").append("<");
+ if (!query.isLiteral()) {
+ subjectSb.append("RegExp hit: ");
+ } else {
+ subjectSb.append("Keyword hit: ");
+ }
+ subjectSb.append("<");
String uniqueKey = null;
BlackboardAttribute attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID());
if (attr != null) {
@@ -580,37 +584,49 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
//String uniqueKey = queryStr;
//details
- //title
- detailsSb.append("Keyword hit | Preview | ");
- detailsSb.append("File | List | ");
- if (! query.isLiteral())
- detailsSb.append("Regex | ");
- detailsSb.append("
---|
");
-
+ detailsSb.append("");
//hit
+ detailsSb.append("");
+ detailsSb.append("Keyword hit | ");
detailsSb.append("").append(StringEscapeUtils.escapeHtml(attr.getValueString())).append(" | ");
-
- //preview
+ detailsSb.append("
");
+
+ //preview
attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID());
if (attr != null) {
+ detailsSb.append("");
+ detailsSb.append("Preview | ");
detailsSb.append("").append(StringEscapeUtils.escapeHtml(attr.getValueString())).append(" | ");
+ detailsSb.append("
");
+
}
-
+
//file
+ detailsSb.append("");
+ detailsSb.append("File | ");
detailsSb.append("").append(hitFile.getParentPath()).append(hitFile.getName()).append(" | ");
-
+ detailsSb.append("
");
+
+
//list
attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_SET.getTypeID());
+ detailsSb.append("");
+ detailsSb.append("List | ");
detailsSb.append("").append(attr.getValueString()).append(" | ");
-
+ detailsSb.append("
");
+
//regex
if (!query.isLiteral()) {
attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID());
if (attr != null) {
+ detailsSb.append("");
+ detailsSb.append("List | ");
detailsSb.append("").append(attr.getValueString()).append(" | ");
+ detailsSb.append("
");
+
}
}
- detailsSb.append("
");
+ detailsSb.append("
");
managerProxy.postMessage(IngestMessage.createDataMessage(++messageID, instance, subjectSb.toString(), detailsSb.toString(), uniqueKey, res.getArtifact()));
}