Commit 08380ab4 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'draft/eevidence_crxx9' into 'draft/eevidence' 

CRxx9 - Adding missing AdditionalInfo field in PreservationStatus

See merge request !347
parents 062a1595 39c732bd

104144/examples/form3.xml

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ 
                            <form3:PreservationStatus>

                                <form3:PreservationStatus>

                                    <form3:RelatedTask>f966e795-bc92-4bc4-9c6b-96c1b1b8cb1d</form3:RelatedTask>

                                    <form3:Status>NOT_PRESERVED</form3:Status>

                                    <form3:Preserved>true</form3:Preserved>

                                    <form3:NotPreserved>true</form3:NotPreserved>

                                    <form3:AdditionalInformation>Free text explaining why both Preserved and Not Preserved are set i.e. that data has been partially preserved</form3:AdditionalInformation>

                                </form3:PreservationStatus>

                            </form3:PreservationStatus>

                            <form3:AdditionalInformation>Any additional information from section G</form3:AdditionalInformation>

104144/schema/xsd/ts_104144_Form3.xsd

+3 −7
Original line number Diff line number Diff line
@@ -97,13 +97,9 @@ 
    <xs:complexType name="PreservationStatus">

        <xs:sequence>

            <xs:element name="RelatedTask" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="Status" type="PreservationStatusType" minOccurs="0"/>

            <xs:element name="Preserved" type="xs:boolean" minOccurs="0"/>

            <xs:element name="NotPreserved" type="xs:boolean" minOccurs="0"/>

            <xs:element name="AdditionalInformation" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="PreservationStatusType">

        <xs:restriction base="xs:string">

            <xs:enumeration value="PRESERVED"/>

            <xs:enumeration value="NOT_PRESERVED"/>

        </xs:restriction>

    </xs:simpleType>

</xs:schema>
 
 No newline at end of file