From 11b05c47ea1022abafeb39c87d4586e56620ea11 Mon Sep 17 00:00:00 2001 From: "Samuel H. Kenyon" Date: Sun, 27 Apr 2014 18:30:58 -0400 Subject: [PATCH] made the data_source element optional in the XML schema --- .../externalresults/ExternalResultsXML.java | 15 ++++++++++----- .../externalresults/autopsy_external_results.xsd | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/externalresults/ExternalResultsXML.java b/Core/src/org/sleuthkit/autopsy/modules/externalresults/ExternalResultsXML.java index a1a7dc19ba..a7b7f0edb6 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/externalresults/ExternalResultsXML.java +++ b/Core/src/org/sleuthkit/autopsy/modules/externalresults/ExternalResultsXML.java @@ -103,20 +103,25 @@ public class ExternalResultsXML implements ExternalResultsParser { return resultsData; } + /** + * + * @param root + * @throws Exception + */ private void parseDataSource(Element root ) throws Exception { NodeList nodeList = root.getElementsByTagName(DATASRC_EL); final int numNodes = nodeList.getLength(); - if (numNodes == 0) { - throw new Exception("Error: No data source specified in XML file."); - } - for(int index = 0; index < numNodes; ++index) { Element el = (Element)nodeList.item(index); - + resultsData.addDataSource(el.getTextContent()); } } + /** + * + * @param root + */ private void parseArtifacts(Element root ) { NodeList nodeList = root.getElementsByTagName(ARTLIST_EL); final int numNodes = nodeList.getLength(); diff --git a/Core/src/org/sleuthkit/autopsy/modules/externalresults/autopsy_external_results.xsd b/Core/src/org/sleuthkit/autopsy/modules/externalresults/autopsy_external_results.xsd index aa17542f60..2fd6d6397a 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/externalresults/autopsy_external_results.xsd +++ b/Core/src/org/sleuthkit/autopsy/modules/externalresults/autopsy_external_results.xsd @@ -3,7 +3,7 @@ - +