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

4440 intial case-dataSource-file common property search results

Browse Source
This commit is contained in:
William Schaefer 2018-12-03 11:42:28 -05:00
parent 5ca0b68398
commit 501ed372ff
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/commonfilesearch/InstanceDataSourceNode.java
View File

@ -19,9 +19,7 @@
*/ */
package org.sleuthkit.autopsy.commonfilesearch; package org.sleuthkit.autopsy.commonfilesearch;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.openide.nodes.ChildFactory; import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children; import org.openide.nodes.Children;
import org.openide.nodes.Node; import org.openide.nodes.Node;

8
Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
View File

@ -265,7 +265,6 @@ final class InterCaseSearchResultsProcessor {
// private CommonAttributeValue commonAttributeValue = null; // private CommonAttributeValue commonAttributeValue = null;
String caseName = null; String caseName = null;
String dataSourceName = null; String dataSourceName = null;
private String previousRowValue = "";
@Override @Override
public void process(ResultSet resultSet) { public void process(ResultSet resultSet) {
@ -273,9 +272,6 @@ final class InterCaseSearchResultsProcessor {
while (resultSet.next()) { while (resultSet.next()) {
int resultId = InstanceTableCallback.getId(resultSet); int resultId = InstanceTableCallback.getId(resultSet);
String corValue = InstanceTableCallback.getValue(resultSet); String corValue = InstanceTableCallback.getValue(resultSet);
if (previousRowValue.isEmpty()) {
previousRowValue = corValue;
}
if (corValue == null || HashUtility.isNoDataMd5(corValue)) { if (corValue == null || HashUtility.isNoDataMd5(corValue)) {
continue; continue;
} }
@ -295,7 +291,9 @@ final class InterCaseSearchResultsProcessor {
searchResult.setCurrentAttributeInst(corrAttr); searchResult.setCurrentAttributeInst(corrAttr);
CommonAttributeValue commonAttributeValue = new CommonAttributeValue(corValue); CommonAttributeValue commonAttributeValue = new CommonAttributeValue(corValue);
commonAttributeValue.addInstance(searchResult); commonAttributeValue.addInstance(searchResult);
valueList.addMetadataToList(new CommonAttributeValue(corValue)); valueList.addMetadataToList(commonAttributeValue);
dataSourceToFile.put(dataSourceName,valueList);
caseCollatedDataSourceCollections.put(caseName, dataSourceToFile);
} }
} catch (EamDbException | SQLException ex) { } catch (EamDbException | SQLException ex) {
LOGGER.log(Level.WARNING, "Error getting artifact instances from database.", ex); // NON-NLS LOGGER.log(Level.WARNING, "Error getting artifact instances from database.", ex); // NON-NLS