Merge pull request #4706 from raman-bt/8448-multicasesearch-kwl-2

4884: Add support for keyword lists to multi-case keyword search
This commit is contained in:
Richard Cordovano 2019-04-12 13:29:07 -04:00 committed by GitHub
commit 0185bf35fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions

View File

@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
* with a keyword. This feature was added to support an initial implementation * with a keyword. This feature was added to support an initial implementation
* of account number search and may be removed in the future. * of account number search and may be removed in the future.
*/ */
class Keyword { public class Keyword {
private String searchTerm; private String searchTerm;
private boolean isLiteral; private boolean isLiteral;
@ -123,7 +123,7 @@ class Keyword {
* *
* @return The search term. * @return The search term.
*/ */
String getSearchTerm() { public String getSearchTerm() {
return searchTerm; return searchTerm;
} }
@ -133,7 +133,7 @@ class Keyword {
* *
* @return True or false. * @return True or false.
*/ */
boolean searchTermIsLiteral() { public boolean searchTermIsLiteral() {
return isLiteral; return isLiteral;
} }
@ -144,7 +144,7 @@ class Keyword {
* *
* @return True or false. * @return True or false.
*/ */
boolean searchTermIsWholeWord() { public boolean searchTermIsWholeWord() {
return isWholeWord; return isWholeWord;
} }

View File

@ -167,7 +167,7 @@ public class KeywordList {
* *
* @return A colleciton of Keyword objects. * @return A colleciton of Keyword objects.
*/ */
List<Keyword> getKeywords() { public List<Keyword> getKeywords() {
return keywords; return keywords;
} }

View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2014 Basis Technology Corp. * Copyright 2014-2019 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -52,6 +52,8 @@ public class KeywordListsManager extends Observable {
/** /**
* Gets the singleton instance of the keyword lists manager. * Gets the singleton instance of the keyword lists manager.
*
* @return an instance of KeywordListsManager.
*/ */
public static synchronized KeywordListsManager getInstance() { public static synchronized KeywordListsManager getInstance() {
if (instance == null) { if (instance == null) {
@ -73,6 +75,17 @@ public class KeywordListsManager extends Observable {
return names; return names;
} }
/**
* Get keyword list by name.
*
* @param name id of the list
*
* @return keyword list representation, null if no list by that name
*/
public KeywordList getList(String name) {
return XmlKeywordSearchList.getCurrent().getList(name);
}
/** /**
* Force reload of the keyword lists XML file. * Force reload of the keyword lists XML file.
*/ */