This commit is contained in:
adam-m 2012-06-29 15:29:38 -04:00
commit b17e4053b6
2 changed files with 7 additions and 5 deletions

View File

@ -86,7 +86,8 @@ public class Report {
table.append("<table><thead><tr><th>").append("File Name").append("</th><th>Preview</th><th>Keyword List</th></tr><tbody>");
}
table.append("<tr><td>").append(uniqueresults.getString("name")).append("</td>");
table.append("<td>").append(StringEscapeUtils.escapeHtml(uniqueresults.getString("preview"))).append("</td>").append("<td>").append(uniqueresults.getString("list")).append("<br />(").append(uniqueresults.getString("exp")).append(")").append("</td>").append("</tr>");
String previewreplace = StringEscapeUtils.escapeHtml(uniqueresults.getString("preview"));
table.append("<td>").append(previewreplace.replaceAll("<!", "")).append("</td>").append("<td>").append(uniqueresults.getString("list")).append("<br />(").append(uniqueresults.getString("exp")).append(")").append("</td>").append("</tr>");
}
tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_keyword;");
@ -99,7 +100,7 @@ public class Report {
File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
boolean success = f1.delete();
table.append("</tbody></table><br /><br />");
} catch (Exception e) {
Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e);
}
@ -152,7 +153,7 @@ public class Report {
File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
boolean success = f1.delete();
table.append("</tbody></table><br /><br />");
} catch (Exception e) {
Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e);
}
@ -230,6 +231,7 @@ public class Report {
File f1 = new File(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
boolean success = f1.delete();
table.append("</tbody></table><br /><br />");
} catch (Exception e) {
Logger.getLogger(Report.class.getName()).log(Level.WARNING, "Exception occurred", e);

View File

@ -151,7 +151,7 @@ public class ReportHTML implements ReportModule {
int reportsize = report.size();
Integer filesystemcount = currentCase.getRootObjectsCount();
DateFormat datetimeFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy");
DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy-HH-mm-ss");
Date date = new Date();
String datetime = datetimeFormat.format(date);
String datenotime = dateFormat.format(date);