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

use right value

Browse Source
This commit is contained in:
Karl Mortensen 2015-11-20 09:48:01 -05:00
parent 4a085c0c07
commit 4bfba78518
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
View File

@ -260,12 +260,14 @@ public class ExtractedContentViewer implements DataContentViewer {
* @return The document ID or zero, which is an invalid document ID. * @return The document ID or zero, which is an invalid document ID.
*/ */
private Long getDocumentId(Node node) { private Long getDocumentId(Node node) {
/* /**
* If the node is a Blackboard artifact node for anything other than a * If the node is a Blackboard artifact node for anything other than a
* keyword hit, the document ID for the text extracted from the artifact * keyword hit, the document ID for the text extracted from the artifact
* (the concatenation of its attributes) is the artifact ID, a large, * (the concatenation of its attributes) is the artifact ID, a large,
* negative integer. * negative integer. If it is a keyword hit, see if there is an
*/ // KDM update comments. * associated artifact. If there is, get the associated artifact's ID
* and return it.
*/
BlackboardArtifact artifact = node.getLookup().lookup(BlackboardArtifact.class); BlackboardArtifact artifact = node.getLookup().lookup(BlackboardArtifact.class);
if (null != artifact) { if (null != artifact) {
if (artifact.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) { if (artifact.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) {
@ -275,10 +277,10 @@ public class ExtractedContentViewer implements DataContentViewer {
// Get the associated artifact attribute and return its value as the ID // Get the associated artifact attribute and return its value as the ID
List<BlackboardAttribute> blackboardAttributes = artifact.getAttributes(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT); List<BlackboardAttribute> blackboardAttributes = artifact.getAttributes(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT);
if (!blackboardAttributes.isEmpty()) { if (!blackboardAttributes.isEmpty()) {
return artifact.getAttributes(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT).get(0).getArtifactID(); return blackboardAttributes.get(0).getValueLong();
} }
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
Exceptions.printStackTrace(ex); // KDM logger.log(Level.SEVERE, "Error getting associated artifact attributes", ex); //NON-NLS
} }
} }
} }
@ -286,7 +288,8 @@ public class ExtractedContentViewer implements DataContentViewer {
/* /*
* For keyword search hit artifact nodes and all other nodes, the * For keyword search hit artifact nodes and all other nodes, the
* document ID for the extracted text is the ID of the associated * document ID for the extracted text is the ID of the associated
* content, if any. KDM update comments * content, if any, unless there is an associated artifact, which
* is handled above
*/ */
Content content = node.getLookup().lookup(Content.class); Content content = node.getLookup().lookup(Content.class);
if (content != null) { if (content != null) {