From 9ee31dc70e74b407189b1926a3f86bca61bce9da Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Fri, 6 Jun 2014 12:30:17 -0400
Subject: [PATCH] Fix external results XSD

---
 .../autopsy_external_results.xsd              | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/externalresults/autopsy_external_results.xsd b/Core/src/org/sleuthkit/autopsy/externalresults/autopsy_external_results.xsd
index 924784f503..374d2fd495 100644
--- a/Core/src/org/sleuthkit/autopsy/externalresults/autopsy_external_results.xsd
+++ b/Core/src/org/sleuthkit/autopsy/externalresults/autopsy_external_results.xsd
@@ -2,21 +2,29 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="autopsy_results">
         <xs:complexType>
-            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:sequence minOccurs="0" maxOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="1" name="data_source" type="xs:string" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="derived_files">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element maxOccurs="unbounded" name="derived_file">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="local_path" type="xs:string" />
+                                        <xs:element minOccurs="0" name="parent_file" type="xs:string" />
+                                    </xs:sequence>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="artifacts">
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="artifact">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element minOccurs="0" maxOccurs="1" name="file">
-                                            <xs:complexType>
-                                                <xs:sequence>
-                                                    <xs:element name="path" type="xs:string" />
-                                                </xs:sequence>
-                                            </xs:complexType>
-                                        </xs:element>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="source_file" type="xs:string" />
                                         <xs:element minOccurs="0" maxOccurs="unbounded" name="attribute">
                                             <xs:complexType>
                                                 <xs:sequence>
@@ -29,7 +37,7 @@
                                                             </xs:simpleContent>
                                                         </xs:complexType>
                                                     </xs:element>
-                                                    <xs:element minOccurs="0" maxOccurs="1" name="source" type="xs:string" />
+                                                    <xs:element minOccurs="0" maxOccurs="1" name="source_module" type="xs:string" />
                                                 </xs:sequence>
                                                 <xs:attribute name="type" type="xs:string" use="required" />
                                             </xs:complexType>
@@ -47,22 +55,9 @@
                             <xs:element maxOccurs="unbounded" name="report">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element name="display_name" type="xs:string" />
                                         <xs:element name="local_path" type="xs:string" />
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element minOccurs="0" maxOccurs="unbounded" name="derived_files">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element maxOccurs="unbounded" name="derived_file">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="local_path" type="xs:string" />
-                                        <xs:element minOccurs="0" name="parent_path" type="xs:string" />
+                                        <xs:element name="source_module" type="xs:string" />
+                                        <xs:element minOccurs="0" maxOccurs="1" name="report_name" type="xs:string" />
                                     </xs:sequence>
                                 </xs:complexType>
                             </xs:element>