diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java index b35434be0e..7c558ef592 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2019 Basis Technology Corp. + * Copyright 2019-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,21 +22,17 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeIns import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeNormalizationException; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb; import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException; -import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.filequery.FileSearchData.FileSize; import org.sleuthkit.autopsy.filequery.FileSearchData.FileType; import org.sleuthkit.autopsy.filequery.FileSearchData.Frequency; import org.sleuthkit.autopsy.filequery.FileSearchData.Score; - import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; - import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; import java.util.stream.Collectors; import org.openide.util.NbBundle; import org.sleuthkit.datamodel.BlackboardArtifact; @@ -48,8 +44,6 @@ import org.sleuthkit.datamodel.TskData; */ class FileSearchFiltering { - private final static Logger logger = Logger.getLogger(FileSearchFiltering.class.getName()); - /** * Run the given filters to get a list of matching files. * @@ -61,18 +55,9 @@ class FileSearchFiltering { * @return */ static List runQueries(List filters, SleuthkitCase caseDb, EamDb centralRepoDb) throws FileSearchException { - if (caseDb == null) { throw new FileSearchException("Case DB parameter is null"); // NON-NLS } - - // Record the selected filters - String filterStr = ""; - for (FileFilter filter : filters) { - filterStr += " " + filter.getDesc() + "\n"; - } - logger.log(Level.INFO, "Running filters:\n{0}", filterStr); - // Combine all the SQL queries from the filters into one query String combinedQuery = ""; for (FileFilter filter : filters) { @@ -112,8 +97,6 @@ class FileSearchFiltering { private static List getResultList(List filters, String combinedQuery, SleuthkitCase caseDb, EamDb centralRepoDb) throws TskCoreException, FileSearchException { // Get all matching abstract files List resultList = new ArrayList<>(); - - logger.log(Level.INFO, "Running SQL query: {0}", combinedQuery); List sqlResults = caseDb.findAllFilesWhere(combinedQuery); // If there are no results, return now