From 6bdabee9dde93b3a8d1eb4462fb583ac541f6e81 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Mon, 23 Sep 2013 12:28:55 -0400
Subject: [PATCH] added error messages for problematic multipart e01, 001 files

---
 .../casemodule/AddImageErrorsDialog.form      |  2 +-
 .../casemodule/AddImageErrorsDialog.java      |  2 +-
 .../AddImageWizardIngestConfigPanel.java      | 22 +++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.form b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.form
index b0cd0483aa..f6b3b27078 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.form
@@ -61,11 +61,11 @@
       <SubComponents>
         <Component class="javax.swing.JTextArea" name="errorsText">
           <Properties>
+            <Property name="editable" type="boolean" value="false"/>
             <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="f0" green="f0" red="f0" type="rgb"/>
             </Property>
             <Property name="columns" type="int" value="20"/>
-            <Property name="editable" type="boolean" value="false"/>
             <Property name="rows" type="int" value="5"/>
           </Properties>
         </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java
index 2898f502d4..87670b1455 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageErrorsDialog.java
@@ -108,7 +108,7 @@ public class AddImageErrorsDialog extends javax.swing.JDialog {
 
     
    public void setErrors(String errors) {
-        errorsText.setText(errors);
+        errorsText.append(errors);
     }
     
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index 58f5b38620..f3d9a6ba0f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -602,7 +602,8 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
                     progressPanel.setErrors(errorString, true);
                 }
                 return;
-            } else if (errorString != null) {
+            }
+            if (errorString != null) {
                 //data error (non-critical)
                 logger.log(Level.INFO, "Handling non-critical errors that occured in add image process");
                 progressPanel.setErrors(errorString, false);
@@ -720,15 +721,28 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
                         int readBytes = newImage.read(buf, v.getStart() + v.getLength() - 1, 1);
 
                         if (readBytes < 0) {
-                            logger.warning("problem reading volume");
+                            logger.warning("problem reading volume.  Not as much data as expected");
+                            errorString += "\n problem reading volume";
+                            progressPanel.setErrors(errorString, false);
                         }
                     } catch (TskCoreException ex) {
-                        logger.warning("error reading volume: " + ex.getLocalizedMessage());
+                        errorString += "\n  Not as much data as expected: error reading volume:" + ex.getLocalizedMessage();
+                        progressPanel.setErrors(errorString, false);
+                        logger.warning(" Not as much data as expected: error reading volume: " + ex.getLocalizedMessage());
                     }
                 }
             }
             List<FileSystem> fileSystems = newImage.getFileSystems();
-
+            for (FileSystem fs : fileSystems) {
+                  byte[] buf = new byte[100];
+                fs.getBlock_count();
+                fs.getBlock_size();
+                fs.getSize();
+                fs.getImageOffset();
+                //fs.read(buf, offset, len);
+                  
+              //  fs.read(buf, fs.getl, len);
+            }
             logger.log(Level.INFO, "found file systems: " + fileSystems.size());
         }
     }