Bugfix ingest ongoing warning

This commit is contained in:
Devin148 2012-11-09 16:30:41 -05:00
parent 94c8749862
commit c24c8a442f

View File

@ -490,9 +490,6 @@ public class ReportHTML implements ReportModule {
// and map them to their attribute_type_id // and map them to their attribute_type_id
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID())).append("</td>\n");
@ -541,9 +538,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n");
@ -593,9 +587,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID())).append("</td>\n");
@ -644,9 +635,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH.getTypeID())).append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID())).append("</td>\n");
@ -694,9 +682,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID())).append("</strong></td>\n"); row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME.getTypeID())).append("</strong></td>\n");
row.append("<td>").append(file.getUniquePath()).append("</td>\n"); row.append("<td>").append(file.getUniquePath()).append("</td>\n");
@ -742,9 +727,6 @@ public class ReportHTML implements ReportModule {
Long fileSize = file.getSize(); Long fileSize = file.getSize();
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(objId.toString()).append("</td>\n"); row.append("<td>").append(objId.toString()).append("</td>\n");
row.append("<td><strong>").append(file.getName().toString()).append("</strong></td>\n"); row.append("<td><strong>").append(file.getName().toString()).append("</strong></td>\n");
@ -791,9 +773,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID())).append("</strong></td>\n"); row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID())).append("</strong></td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n");
@ -869,9 +848,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_MODEL.getTypeID())).append("</strong></td>\n"); row.append("<td><strong>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_MODEL.getTypeID())).append("</strong></td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_ID.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DEVICE_ID.getTypeID())).append("</td>\n");
@ -918,9 +894,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID())).append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID())).append("</td>\n");
@ -968,9 +941,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(file != null ? file.getName() : "").append("</td>\n"); row.append("<td>").append(file != null ? file.getName() : "").append("</td>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID())).append("</td>\n");
@ -1021,9 +991,6 @@ public class ReportHTML implements ReportModule {
TreeMap<Integer, String> attributes = getAttributes(entry.getValue()); TreeMap<Integer, String> attributes = getAttributes(entry.getValue());
StringBuilder row = new StringBuilder(); StringBuilder row = new StringBuilder();
if (IngestManager.getDefault().isIngestRunning() || IngestManager.getDefault().areModulesRunning()) {
row.append(INGEST_WARNING);
}
row.append("<tr>\n"); row.append("<tr>\n");
row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION.getTypeID())).append("</td>\n"); row.append("<td>").append(attributes.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION.getTypeID())).append("</td>\n");
row.append("<td>").append(file.getName()).append("</td>\n"); row.append("<td>").append(file.getName()).append("</td>\n");