From 67ff3ee7cdfdbccee50c1d7c0875b087c9d89cc8 Mon Sep 17 00:00:00 2001
From: sidheshenator <sidheshenator@gmail.com>
Date: Wed, 24 Jun 2015 15:30:11 -0400
Subject: [PATCH] Text FileReport added to databse. Logger format changed

---
 Core/src/org/sleuthkit/autopsy/casemodule/Case.java   | 11 ++++++++++-
 Core/src/org/sleuthkit/autopsy/coreutils/Logger.java  |  2 +-
 .../org/sleuthkit/autopsy/report/FileReportText.java  |  7 +++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index db1250ebf7..759c431a52 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -25,6 +25,8 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.GregorianCalendar;
@@ -1163,7 +1165,14 @@ public class Case implements SleuthkitCase.ErrorObserver {
      * @throws TskCoreException
      */
     public void addReport(String localPath, String srcModuleName, String reportName) throws TskCoreException {
-        Report report = this.db.addReport(localPath, srcModuleName, reportName);
+        String normalizedLocalPath;
+        try {
+            normalizedLocalPath = Paths.get(localPath).normalize().toString();
+        } catch (InvalidPathException ex) {
+            logger.log(Level.WARNING, "Invalid local path provided: " + localPath, ex);
+            normalizedLocalPath = localPath;
+        }
+        Report report = this.db.addReport(normalizedLocalPath, srcModuleName, reportName);
         try {
             Case.pcs.firePropertyChange(Events.REPORT_ADDED.toString(), null, report);
         } catch (Exception ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
index 494c86cf7f..8ae2480883 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
@@ -79,7 +79,7 @@ public final class Logger extends java.util.logging.Logger {
                                             + record.getSourceMethodName() + "\n"
                                             + record.getLevel() + ": "
                                             + this.formatMessage(record) + "\n"
-                                            + record.getThrown().toString() + ": "
+                                            + record.getThrown().toString() + ":\n"
                                             + StackTrace
                                             + "\n";
                                 } else {
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
index 2dd7e8b676..d7eac93477 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
@@ -30,7 +30,9 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * A Tab-delimited text report of the files in the case.
@@ -68,8 +70,13 @@ import org.sleuthkit.datamodel.AbstractFile;
         if (out != null) {
             try {
                 out.close();
+                Case.getCurrentCase().addReport(reportPath, NbBundle.getMessage(this.getClass(),
+                        "FileReportText.getName.text"), "");
             } catch (IOException ex) {
                 logger.log(Level.WARNING, "Could not close output writer when ending report.", ex); //NON-NLS
+            } catch (TskCoreException ex) {
+                String errorMessage = String.format("Error adding %s to case as a report", reportPath); //NON-NLS
+                logger.log(Level.SEVERE, errorMessage, ex);
             }
         }
     }