Merge pull request #1826 from BasisOlivers/custom_attribute_addition-1865

Added integration of Datetime and new type class with attribute const…
This commit is contained in:
Richard Cordovano 2016-01-20 16:42:21 -05:00
commit f85a6f7ac7

View File

@ -7,6 +7,7 @@ package org.sleuthkit.autopsy.modules.UserArtifacts;
import com.sun.media.jfxmedia.logging.Logger;
import java.util.List;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.services.FileManager;
@ -21,8 +22,10 @@ import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
import org.sleuthkit.datamodel.BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TskDataException;
/**
*
@ -53,9 +56,9 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
} else {
art2 = dataSource.newArtifact(type2ID);
}
art1.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COUNT,
UserArtifactIngestModuleFactory.getModuleName(), 5));
BlackboardAttribute.Type type = Case.getCurrentCase().getSleuthkitCase().addArtifactAttributeType("TEST1", TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER, "TEST2");
art1.addAttribute(new BlackboardAttribute(type,
UserArtifactIngestModuleFactory.getModuleName(), -1));
progressBar.progress(1);
art2.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MIN_COUNT,
UserArtifactIngestModuleFactory.getModuleName(), 4));
@ -69,6 +72,8 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
return ProcessResult.OK;
} catch (TskCoreException ex) {
return ProcessResult.ERROR;
} catch (TskDataException ex) {
return ProcessResult.ERROR;
}
}