From b32ed1971e3167715c0918da14a6cd30b2869e17 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Fri, 12 Mar 2021 11:26:55 -0500
Subject: [PATCH] More alignment for catalog

More alignment to catalog.
---
 .../aleap-artifact-attribute-reference.xml           | 12 ++++++------
 .../ileap-artifact-attribute-reference.xml           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/aleap-artifact-attribute-reference.xml b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/aleap-artifact-attribute-reference.xml
index fcac67a398..27d3bc7263 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/aleap-artifact-attribute-reference.xml
+++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/aleap-artifact-attribute-reference.xml
@@ -48,7 +48,7 @@
 
         <FileName filename="accounts de 0.tsv" description="Accounts_de">
             <ArtifactName artifactname="TSK_SERVICE_ACCOUNT" comment="accounts de 0">
-                <AttributeName attributename="TSK_DATETIME_ACCESSED" columnName="Last password entry" required="no" />
+                <AttributeName attributename="null" columnName="Last password entry" required="no" />
                 <AttributeName attributename="TSK_USER_ID" columnName="Name" required="yes" />
                 <AttributeName attributename="TSK_PROG_NAME" columnName="Type" required="yes" />
             </ArtifactName>
@@ -72,7 +72,7 @@
                 <AttributeName attributename="TSK_VALUE" columnName="Value" required="yes" />
                 <AttributeName attributename="TSK_DATETIME_CREATED" columnName="Created Date" required="yes" />
                 <AttributeName attributename="TSK_DATETIME_END" columnName="Expiration Date" required="yes" />
-                <AttributeName attributename="TSK_PATH" columnName="Path" required="yes" />
+                <AttributeName attributename="null" columnName="Path" required="yes" />
             </ArtifactName>
         </FileName>
 
@@ -318,7 +318,7 @@
     <FileName filename="installed apps library.tsv" description="Installed Apps (Library)">
         <ArtifactName artifactname="TSK_INSTALLED_PROG" comment="Installed Apps (Library)">
             <AttributeName attributename="TSK_DATETIME" columnName="Purchase Time" required="yes"/>
-            <AttributeName attributename="TSK_USER_NAME" columnName="Account" required="yes"/>
+            <AttributeName attributename="null" columnName="Account" required="no"/>
             <AttributeName attributename="TSK_PROG_NAME" columnName="Doc ID" required="yes"/>
         </ArtifactName>
     </FileName>
@@ -333,7 +333,7 @@
         <ArtifactName artifactname="TSK_INSTALLED_PROG" comment="Installed Apps (Vending)">
             <AttributeName attributename="TSK_DATETIME" columnName="First Download" required="yes" />
             <AttributeName attributename="TSK_PROG_NAME" columnName="Package Name" required="yes" />
-            <AttributeName attributename="TSK_TITLE" columnName="Title" required="yes" />
+            <AttributeName attributename="null" columnName="Title" required="no" />
             <AttributeName attributename="null" columnName="Install Reason" required="no" />
             <AttributeName attributename="null" columnName="Auto Update?" required="no" />
         </ArtifactName>
@@ -482,8 +482,8 @@
             <AttributeName attributename="TSK_PHONE_NUMBER_TO" columnName="recipients" required="yes"/>
             <AttributeName attributename="TSK_DIRECTION" columnName="direction" required="yes"/>
             <AttributeName attributename="TSK_TEXT" columnName="content" required="yes"/>
-            <AttributeName attributename="TSK_DATETIME_START" columnName="send_timestamp" required="yes" />
-            <AttributeName attributename="TSK_DATETIME_END" columnName="received_timestamp" required="yes"/>
+            <AttributeName attributename="TSK_DATETIME" columnName="send_timestamp" required="yes" />
+            <AttributeName attributename="null" columnName="received_timestamp" required="no"/>
             <AttributeName attributename="TSK_PHONE_NUMBER_FROM" columnName="number" required="yes"/>
             <AttributeName attributename="TSK_ATTACHMENTS" columnName="name" required="yes" />
             <AttributeName attributename="TSK_TEXT_FILE" columnName="source file" required="yes"/>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ileap-artifact-attribute-reference.xml b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ileap-artifact-attribute-reference.xml
index 85df267353..16409f42c7 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ileap-artifact-attribute-reference.xml
+++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ileap-artifact-attribute-reference.xml
@@ -312,7 +312,7 @@
 
         <FileName filename="KnowledgeC Application in Focus.tsv" description="KnowledgeC Application In Focus">
             <ArtifactName artifactname="TSK_PROG_RUN" comment="KnowledgeC Application In Focus">
-                <AttributeName attributename="TSK_DATETIME_START" columnName="Start" required="yes" />
+                <AttributeName attributename="TSK_DATETIME" columnName="Start" required="yes" />
                 <AttributeName attributename="null" columnName="End" required="no" />
                 <AttributeName attributename="TSK_PROG_NAME" columnName="Bundle ID" required="yes" />
                 <AttributeName attributename="null" columnName="Usage in Seconds" required="no" />
@@ -731,13 +731,13 @@
             <ArtifactName artifactname="TSK_WEB_SEARCH_QUERY" comment="null">
                 <AttributeName attributename="TSK_DATETIME_ACCESSED" columnName="Visit Time" required="yes" />
                 <AttributeName attributename="TSK_TEXT" columnName="Search Term" required="yes" />
-                <AttributeName attributename="TSK_URL" columnName="URL" required="yes" />
+                <AttributeName attributename="null" columnName="URL" required="yes" />
                 <AttributeName attributename="null" columnName="Visit Count" required="no" />
-                <AttributeName attributename="TSK_TITLE" columnName="Title" required="yes" />
+                <AttributeName attributename="null" columnName="Title" required="no" />
                 <AttributeName attributename="null" columnName="iCloud Sync" required="no" />			
                 <AttributeName attributename="null" columnName="Load Successful" required="no" />
                 <AttributeName attributename="null" columnName="Visit ID" required="no" />			
-                <AttributeName attributename="TSK_REFERRER" columnName="Redirect Source" required="yes" />
+                <AttributeName attributename="null" columnName="Redirect Source" required="no" />
                 <AttributeName attributename="null" columnName="Redirect Destination" required="no" />			
                 <AttributeName attributename="null" columnName="History Item ID"	 required="no" />
             </ArtifactName>