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

Merge pull request #2083 from millmanorama/IG-use-alias-in-sql

Browse Source 
use alias in sql query to avoid ambiguity about column name
This commit is contained in:
Richard Cordovano 2016-04-22 14:21:55 -04:00
commit a1bfaabf14
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
View File

@ -1214,7 +1214,7 @@ public final class DrawableDB {
} }
/** /**
* get the number of files in the given set that have the given category. * get the number of files in the given set that are uncategorized(Cat-0).
* *
* NOTE: although the category data is stored in autopsy as Tags, this * NOTE: although the category data is stored in autopsy as Tags, this
* method is provided on DrawableDb to provide a single point of access for * method is provided on DrawableDb to provide a single point of access for
@ -1224,14 +1224,14 @@ public final class DrawableDB {
* get their data form the drawabledb to a layer wrapping the drawable db: * get their data form the drawabledb to a layer wrapping the drawable db:
* something like ImageGalleryCaseData? * something like ImageGalleryCaseData?
* *
* @param cat the category to count the number of files for
* @param fileIDs the the files ids to count within * @param fileIDs the the files ids to count within
* *
* @return the number of the with the given category * @return the number of files with Cat-0
*/ */
public long getCategoryCount(Category cat, Collection<Long> fileIDs) { public long getUncategorizedCount(Collection<Long> fileIDs) {
DrawableTagsManager tagsManager = controller.getTagsManager(); DrawableTagsManager tagsManager = controller.getTagsManager();
// get a comma seperated list of TagName ids for non zero categories
String catTagNameIDs = Category.getNonZeroCategories().stream() String catTagNameIDs = Category.getNonZeroCategories().stream()
.map(tagsManager::getTagName) .map(tagsManager::getTagName)
.map(TagName::getId) .map(TagName::getId)
@ -1240,20 +1240,19 @@ public final class DrawableDB {
String fileIdsList = "(" + StringUtils.join(fileIDs, ",") + " )"; String fileIdsList = "(" + StringUtils.join(fileIDs, ",") + " )";
//count the fileids that are in the given list and don't have a non-zero category assigned to them. //count the file ids that are in the given list and don't have a non-zero category assigned to them.
String name = String name =
"SELECT COUNT(obj_id) FROM tsk_files where obj_id IN " + fileIdsList //NON-NLS "SELECT COUNT(obj_id) as obj_count FROM tsk_files where obj_id IN " + fileIdsList //NON-NLS
+ " AND obj_id NOT IN (SELECT obj_id FROM content_tags WHERE content_tags.tag_name_id IN " + catTagNameIDs + ")"; //NON-NLS + " AND obj_id NOT IN (SELECT obj_id FROM content_tags WHERE content_tags.tag_name_id IN " + catTagNameIDs + ")"; //NON-NLS
try (SleuthkitCase.CaseDbQuery executeQuery = controller.getSleuthKitCase().executeQuery(name); try (SleuthkitCase.CaseDbQuery executeQuery = tskCase.executeQuery(name);
ResultSet resultSet = executeQuery.getResultSet();) { ResultSet resultSet = executeQuery.getResultSet();) {
while (resultSet.next()) { while (resultSet.next()) {
return resultSet.getLong("count(obj_id)"); //NON-NLS return resultSet.getLong("obj_count"); //NON-NLS
} }
} catch (SQLException | TskCoreException ex) { } catch (SQLException | TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Error getting category count.", ex); //NON-NLS LOGGER.log(Level.SEVERE, "Error getting category count.", ex); //NON-NLS
} }
return -1; return -1;
} }
/** /**

3
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/DrawableGroup.java
View File

@ -34,7 +34,6 @@ import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager; import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute; import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
@ -142,7 +141,7 @@ public class DrawableGroup implements Comparable<DrawableGroup> {
public final synchronized long getUncategorizedCount() { public final synchronized long getUncategorizedCount() {
if (uncatCount.get() < 0) { if (uncatCount.get() < 0) {
try { try {
uncatCount.set(ImageGalleryController.getDefault().getDatabase().getCategoryCount(Category.ZERO, fileIDs)); uncatCount.set(ImageGalleryController.getDefault().getDatabase().getUncategorizedCount(fileIDs));
} catch (IllegalStateException | NullPointerException ex) { } catch (IllegalStateException | NullPointerException ex) {
LOGGER.log(Level.WARNING, "could not access case during getFilesWithHashSetHitsCount()"); //NON-NLS LOGGER.log(Level.WARNING, "could not access case during getFilesWithHashSetHitsCount()"); //NON-NLS