From 9d8daa78132378a6038c958a2cb3c70fd3738935 Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Fri, 31 Jul 2015 16:36:17 -0400 Subject: [PATCH 1/2] update log messages --- .../autopsy/casemodule/Bundle.properties | 3 --- .../casemodule/SingleUserCaseImporter.java | 15 +++------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties index a1f36f9f1c..1f01841305 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties @@ -241,8 +241,6 @@ CollaborationMonitor.analyzingDataSourceStatus.msg={0} analyzing {1} MissingImageDialog.lbWarning.text= MissingImageDialog.lbWarning.toolTipText= SingleUserCaseImporter.AlreadyMultiUser=Case is already multi-user! -SingleUserCaseImporter.FinishedImporting=Finished importing -SingleUserCaseImporter.To=to SingleUserCaseImporter.BadCaseSourceFolder=Case source folder does not exist! SingleUserCaseImporter.BadImageSourceFolder=Image source folder does not exist! SingleUserCaseImporter.BadDatabaseFileName=Database file does not exist! @@ -251,7 +249,6 @@ SingleUserCaseImporter.NonUniqueDatabaseName=Database name not unique. Skipping. SingleUserCaseImporter.PotentiallyNonUniqueDatabaseName=Unclear if database name unique. Moving ahead. SingleUserCaseImporter.ImportedAsMultiUser=\nThis case was imported as a multi-user collaborative case on SingleUserCaseImporter.UnableToCopySourceImages=Unable to copy source images -SingleUserCaseImporter.ImportSuccessful=. Import result: SingleUserCaseImporter.DeletingCase=Deleting original case folder SingleUserCaseImporter.CanNotOpenDatabase=Unable to open database NewCaseVisualPanel1.caseParentDirWarningLabel.text=Case directory warning label diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java index bd330daf4c..d9be09630e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java @@ -127,7 +127,7 @@ public class SingleUserCaseImporter implements Runnable { boolean result = true; try { - log("Beginning to import " + input.toString() + " to " + caseOutputFolder + "\\" + oldCaseFolder); //NON-NLS + log("Importing case " + input.toString() + " to " + caseOutputFolder + "\\" + oldCaseFolder); //NON-NLS if (copySourceImages) { checkInput(input.toFile(), new File(imageInputFolder)); @@ -190,9 +190,7 @@ public class SingleUserCaseImporter implements Runnable { FileUtils.deleteDirectory(input.toFile()); } - log(NbBundle.getMessage(SingleUserCaseImporter.class, "SingleUserCaseImporter.FinishedImporting") - + input.toString() + " " + NbBundle.getMessage(SingleUserCaseImporter.class, "SingleUserCaseImporter.To") - + caseOutputFolder + File.separatorChar + newCaseFolder); + log("Finished importing case " + input.toString() + " to " + caseOutputFolder + File.separatorChar + newCaseFolder); } catch (Exception exp) { /// clean up here log(exp.getMessage()); @@ -1292,16 +1290,9 @@ public class SingleUserCaseImporter implements Runnable { * not. True if all was successful, false otherwise. */ private void closeLog(boolean result) { - log(NbBundle.getMessage(SingleUserCaseImporter.class, "SingleUserCaseImporter.FinishedImporting") - + caseInputFolder + " " - + NbBundle.getMessage(SingleUserCaseImporter.class, "SingleUserCaseImporter.To") - + caseOutputFolder - + NbBundle.getMessage(SingleUserCaseImporter.class, "SingleUserCaseImporter.ImportSuccessful") - + result); - + log("Completed batch processing of " + caseInputFolder + " to " + caseOutputFolder + ". Batch processing result: " + ((result == true) ? "Success":"Failure")); if (writer != null) { writer.close(); - } } From a88a00defccb0fa9b6f605692b11f666a2d01792 Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Fri, 31 Jul 2015 17:40:13 -0400 Subject: [PATCH 2/2] add start of batch log --- .../sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java index d9be09630e..acdb2c249d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseImporter.java @@ -1269,6 +1269,7 @@ public class SingleUserCaseImporter implements Runnable { writer = null; Logger.getLogger(SingleUserCaseImporter.class.getName()).log(Level.WARNING, "Error opening log file " + logFile.toString(), ex); } + log("Starting batch processing of " + caseInputFolder + " to " + caseOutputFolder); } /** @@ -1290,7 +1291,7 @@ public class SingleUserCaseImporter implements Runnable { * not. True if all was successful, false otherwise. */ private void closeLog(boolean result) { - log("Completed batch processing of " + caseInputFolder + " to " + caseOutputFolder + ". Batch processing result: " + ((result == true) ? "Success":"Failure")); + log("Completed batch processing of " + caseInputFolder + " to " + caseOutputFolder + ". Batch processing result: " + ((result == true) ? "Success" : "Failure")); if (writer != null) { writer.close(); }