mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1201 from sidheshenator/keywordsearch_output_consistency

Browse Source 
Get consistent snippets across multiple runs
This commit is contained in:
Richard Cordovano 2015-04-20 13:13:43 -04:00
commit 351bc652d9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
View File

@ -268,11 +268,7 @@ class LuceneQuery implements KeywordSearchQuery {
q.setQuery(theQueryStr); q.setQuery(theQueryStr);
q.setRows(MAX_RESULTS); q.setRows(MAX_RESULTS);
if (snippets) { q.setFields(Server.Schema.ID.toString());
q.setFields(Server.Schema.ID.toString());
} else {
q.setFields(Server.Schema.ID.toString());
}
for (KeywordQueryFilter filter : filters) { for (KeywordQueryFilter filter : filters) {
q.addFilterQuery(filter.toString()); q.addFilterQuery(filter.toString());
@ -438,6 +434,8 @@ class LuceneQuery implements KeywordSearchQuery {
if (contentHighlights == null) { if (contentHighlights == null) {
return ""; return "";
} else { } else {
// Sort contentHighlights in order to get consistently same snippet.
contentHighlights.sort(null);
// extracted content is HTML-escaped, but snippet goes in a plain text field // extracted content is HTML-escaped, but snippet goes in a plain text field
return EscapeUtil.unEscapeHtml(contentHighlights.get(0)).trim(); return EscapeUtil.unEscapeHtml(contentHighlights.get(0)).trim();
} }