score dao changes

This commit is contained in:
Greg DiCristofaro 2023-07-04 20:36:50 -04:00
parent cb0adfc447
commit 80b280d2dd

View File

@ -60,11 +60,13 @@ import org.sleuthkit.autopsy.mainui.datamodel.events.TreeEvent;
import org.sleuthkit.autopsy.mainui.nodes.DAOFetcher; import org.sleuthkit.autopsy.mainui.nodes.DAOFetcher;
import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact.Category; import org.sleuthkit.datamodel.BlackboardArtifact.Category;
import org.sleuthkit.datamodel.DataArtifact;
import org.sleuthkit.datamodel.Score.Priority; import org.sleuthkit.datamodel.Score.Priority;
import org.sleuthkit.datamodel.Score.Significance; import org.sleuthkit.datamodel.Score.Significance;
import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TskData; import org.sleuthkit.datamodel.TskData;
import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
/** /**
* Provides information to populate the results viewer for data in the views * Provides information to populate the results viewer for data in the views
@ -282,26 +284,42 @@ public class ScoreDAO extends AbstractDAO {
sqlEx); sqlEx);
} }
// List<RowDTO> fileRows = new ArrayList<>();
// List<AbstractFile> files = getCase().findAllFilesWhere(modifiedWhereStatement);
// if (!fileIds.isEmpty()) {
// List<RowDTO> fileRows = new ArrayList<>(); String joinedFileIds = fileIds.stream()
// for (AbstractFile file : files) { .map(l -> Long.toString(l))
// .collect(Collectors.joining(", "));
// List<Object> cellValues = FileSystemColumnUtils.getCellValuesForAbstractFile(file);
// List<AbstractFile> files = getCase().findAllFilesWhere("obj_id IN (" + joinedFileIds + ")");
// fileRows.add(new FileRowDTO(
// file, for (AbstractFile file : files) {
// file.getId(),
// file.getName(), List<Object> cellValues = FileSystemColumnUtils.getCellValuesForAbstractFile(file);
// file.getNameExtension(),
// MediaTypeUtils.getExtensionMediaType(file.getNameExtension()), fileRows.add(new FileRowDTO(
// file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC), file,
// file.getType(), file.getId(),
// cellValues)); file.getName(),
// } file.getNameExtension(),
// MediaTypeUtils.getExtensionMediaType(file.getNameExtension()),
// return new BaseSearchResultsDTO(FILE_VIEW_EXT_TYPE_ID, displayName, FileSystemColumnUtils.getColumnKeysForAbstractfile(), fileRows, AbstractFile.class.getName(), startItem, totalResultsCount); file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC),
file.getType(),
cellValues));
}
}
if (!artifactIds.isEmpty()) {
String joinedArtifactIds = artifactIds.stream()
.map(l -> Long.toString(l))
.collect(Collectors.joining(", "));
List<DataArtifact> dataArtifacts = getCase().getBlackboard().getDataArtifactsWhere("obj_id IN (" + joinedArtifactIds + ")");
}
//
// return new BaseSearchResultsDTO(FILE_VIEW_EXT_TYPE_ID, displayName, FileSystemColumnUtils.getColumnKeysForAbstractfile(), fileRows, AbstractFile.class.getName(), startItem, totalResultsCount);
} }
private TreeItemDTO<?> createTreeItem(DAOEvent daoEvent, TreeDisplayCount count) { private TreeItemDTO<?> createTreeItem(DAOEvent daoEvent, TreeDisplayCount count) {