From 28d27ac452fcbed9664b44c9f21cf03dc8414a33 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Thu, 14 Jan 2016 09:44:00 -0500 Subject: [PATCH 1/3] Added attributes to the test ingest module --- .../UserArtifacts/UserArtifactIngestModule.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java index 66b9416954..605aa08388 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java @@ -11,6 +11,9 @@ import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress; import org.sleuthkit.autopsy.ingest.IngestJobContext; import org.sleuthkit.datamodel.BlackboardArtifact; +import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; +import org.sleuthkit.datamodel.BlackboardAttribute; +import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.TskCoreException; @@ -28,9 +31,13 @@ public class UserArtifactIngestModule implements DataSourceIngestModule { public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress progressBar) { progressBar.switchToDeterminate(2); try { - dataSource.newArtifact(type1ID); + BlackboardArtifact art1 = dataSource.newArtifact(type1ID); + art1.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW, + UserArtifactIngestModuleFactory.getModuleName(), 4)); progressBar.progress(1); - dataSource.newArtifact(type2ID); + BlackboardArtifact art2 = dataSource.newArtifact(type2ID); + art2.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MIN_COUNT, + UserArtifactIngestModuleFactory.getModuleName(), 4)); progressBar.progress(1); return ProcessResult.OK; } From 226fac3f3e6bebf5e1341e4e03dc982b81e07d3e Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Thu, 14 Jan 2016 09:46:02 -0500 Subject: [PATCH 2/3] Removed unnecessary import --- .../autopsy/modules/UserArtifacts/UserArtifactIngestModule.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java index 605aa08388..d336e978d3 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java @@ -11,7 +11,6 @@ import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress; import org.sleuthkit.autopsy.ingest.IngestJobContext; import org.sleuthkit.datamodel.BlackboardArtifact; -import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE; import org.sleuthkit.datamodel.Content; From f19d7ffbd2fa8433dc7604f646663fd788cd5c6e Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Thu, 14 Jan 2016 11:34:51 -0500 Subject: [PATCH 3/3] Changed attribute type on ingest module --- .../modules/UserArtifacts/UserArtifactIngestModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java index d336e978d3..155c1ef164 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java @@ -31,8 +31,8 @@ public class UserArtifactIngestModule implements DataSourceIngestModule { progressBar.switchToDeterminate(2); try { BlackboardArtifact art1 = dataSource.newArtifact(type1ID); - art1.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW, - UserArtifactIngestModuleFactory.getModuleName(), 4)); + art1.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COUNT, + UserArtifactIngestModuleFactory.getModuleName(), 5)); progressBar.progress(1); BlackboardArtifact art2 = dataSource.newArtifact(type2ID); art2.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MIN_COUNT,