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

Suppress keyword search warnings

Browse Source
This commit is contained in:
Kelly Kelly 2021-01-19 15:37:17 -05:00
parent 9e15aa069e
commit 2da15b16a2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
View File

@ -18,7 +18,6 @@ GlobalEditListPanel.warning.title=Warning
IndexedText.errorMessage.errorGettingText=<span style='font-style:italic'>Error retrieving indexed text.</span>
IndexedText.warningMessage.knownFile=<span style='font-style:italic'>This file is a known file (based on MD5 hash) and does not have indexed text.</span>
IndexedText.warningMessage.noTextAvailable=<span style='font-style:italic'>No indexed text for this file.</span>
KeywordSearchGlobalLanguageSettingsPanel.enableOcrCheckbox.text=Enable Optical Character Recognition (OCR)
KeywordSearchGlobalSearchSettingsPanel.customizeComponents.windowsOCR=Enable Optical Character Recognition (OCR) (Requires Windows 64-bit)
KeywordSearchGlobalSettingsPanel.Title=Global Keyword Search Settings
KeywordSearchIngestModule.init.badInitMsg=Keyword search server was not properly initialized, cannot run keyword search ingest.
@ -38,7 +37,7 @@ KeywordSearchResultFactory.createNodeForKey.noResultsFound.text=No results found
KeywordSearchResultFactory.query.exception.msg=Could not perform the query
OpenIDE-Module-Display-Category=Ingest Module
OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\nThe module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\n\The module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
OpenIDE-Module-Name=KeywordSearch
OptionsCategory_Name_KeywordSearchOptions=Keyword Search
OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search

11
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
View File

@ -1184,7 +1184,7 @@ public class Server {
private boolean collectionExists(String collectionName) throws SolrServerException, IOException {
CollectionAdminRequest.List req = new CollectionAdminRequest.List();
CollectionAdminResponse response = req.process(remoteSolrServer);
List<String> existingCollections = (List<String>) response.getResponse().get("collections");
List<?> existingCollections = (List<?>) response.getResponse().get("collections");
if (existingCollections == null) {
existingCollections = new ArrayList<>();
}
@ -1515,7 +1515,7 @@ public class Server {
}
}
NamedList<Object> request(SolrRequest request) throws SolrServerException, RemoteSolrException, NoOpenCoreException {
NamedList<Object> request(SolrRequest<?> request) throws SolrServerException, RemoteSolrException, NoOpenCoreException {
currentCoreLock.readLock().lock();
try {
if (null == currentCollection) {
@ -1931,12 +1931,13 @@ public class Server {
return Collections.emptyList();
}
NamedList error = (NamedList) statusResponse.getResponse().get("error");
NamedList<?> error = (NamedList) statusResponse.getResponse().get("error");
if (error != null) {
return Collections.emptyList();
}
NamedList cluster = (NamedList) statusResponse.getResponse().get("cluster");
NamedList<?> cluster = (NamedList) statusResponse.getResponse().get("cluster");
@SuppressWarnings("unchecked")
ArrayList<String> liveNodes = (ArrayList) cluster.get("live_nodes");
return liveNodes;
} catch (Exception ex) {
@ -2091,7 +2092,7 @@ public class Server {
return queryClient.query(sq);
}
private NamedList<Object> request(SolrRequest request) throws SolrServerException, RemoteSolrException {
private NamedList<Object> request(SolrRequest<?> request) throws SolrServerException, RemoteSolrException {
try {
return queryClient.request(request);
} catch (Exception e) {