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

First cut at adding list name and original term to Keyword class

Browse Source
This commit is contained in:
Eugene Livis 2017-04-10 16:21:03 -04:00
parent 530c1745b3
commit 06daab8623
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
View File

@ -162,7 +162,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
final Keyword keyword = new Keyword(newWord, !dialog.isKeywordRegex(), dialog.isKeywordExact(), currentKeywordList.getName(), newWord); final Keyword keyword = new Keyword(newWord, !dialog.isKeywordRegex(), dialog.isKeywordExact(), currentKeywordList.getName(), newWord);
if (currentKeywordList.hasKeyword(keyword)) { if (currentKeywordList.hasKeyword(keyword)) {
dupeCount++; dupeCount++;
continue; continue;
} }
//check if valid //check if valid

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
View File

@ -61,7 +61,7 @@ class Keyword {
this.isLiteral = isLiteral; this.isLiteral = isLiteral;
this.isWholeWord = true; this.isWholeWord = true;
this.listName = listName; this.listName = listName;
this.originalTerm = originalTerm; this.originalTerm = originalTerm;
} }
Keyword(String searchTerm, boolean isLiteral, boolean isWholeWord, String listName, String originalTerm) { Keyword(String searchTerm, boolean isLiteral, boolean isWholeWord, String listName, String originalTerm) {

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

@ -70,7 +70,7 @@ class LuceneQuery implements KeywordSearchQuery {
LuceneQuery(KeywordList keywordList, Keyword keyword) { LuceneQuery(KeywordList keywordList, Keyword keyword) {
this.keywordList = keywordList; this.keywordList = keywordList;
this.originalKeyword = keyword; this.originalKeyword = keyword;
this.keywordStringEscaped = this.originalKeyword.getSearchTerm(); this.keywordStringEscaped = this.originalKeyword.getSearchTerm();
} }
@Override @Override

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
View File

@ -206,7 +206,7 @@ final class RegexQuery implements KeywordSearchQuery {
for (KeywordHit hit : keywordHits) { for (KeywordHit hit : keywordHits) {
hitsMultiMap.put(new Keyword(hit.getHit(), true, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), hit); hitsMultiMap.put(new Keyword(hit.getHit(), true, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), hit);
} }
} catch (TskException ex) { } catch (TskException ex) {
// //
} }
} }

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
View File

@ -315,7 +315,7 @@ final class TermsComponentQuery implements KeywordSearchQuery {
} }
results.addResult(new Keyword(term.getTerm(), false, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), new ArrayList<>(termHits)); results.addResult(new Keyword(term.getTerm(), false, originalKeyword.getListName(), originalKeyword.getOriginalTerm()), new ArrayList<>(termHits));
} }
return results; return results;
} }
/** /**