Commit 6d7f7b71 authored by Jonathan Kaufmann's avatar Jonathan Kaufmann Committed by Mark Canterbury
Browse files

Update per revision 2 of the document, based on comments.

parent 23bc8c70

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+8 −4
Original line number Original line Diff line number Diff line
@@ -660,7 +660,7 @@ 
        <DictionaryEntries>

        <DictionaryEntries>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>AwaitingPreservation</Value>

                <Value>AwaitingPreservation</Value>

                <Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>

                <Meaning>The Task is approved, but is not yet processed by the LD system.</Meaning>

            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>Preserved</Value>

                <Value>Preserved</Value>
@@ -676,11 +676,15 @@ 
            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>Cancelled</Value>

                <Value>Cancelled</Value>

                <Meaning>The Task has been permanently cancelled</Meaning>

                <Meaning>The Task has been permanently cancelled.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Expired</Value>

                <Meaning>The retention period of the preserved data has expired.</Meaning>

            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>Error</Value>

                <Value>Error</Value>

                <Meaning>TThe Task has not been processed due to a problem with the underlying LP system.</Meaning>

                <Meaning>The Task has not been processed due to a problem with the underlying LP system.</Meaning>

            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>Invalid</Value>

                <Value>Invalid</Value>
@@ -703,7 +707,7 @@ 
            </DictionaryEntry>

            </DictionaryEntry>

            <DictionaryEntry>

            <DictionaryEntry>

                <Value>Cancelled</Value>

                <Value>Cancelled</Value>

                <Meaning>The Task has been permanently cancelled</Meaning>

                <Meaning>The Task has been permanently cancelled.</Meaning>

            </DictionaryEntry>

            </DictionaryEntry>

        </DictionaryEntries>

        </DictionaryEntries>

    </Dictionary>

    </Dictionary>

103120/schema/ts_103120_Task.xsd

+2 −2
Original line number Original line Diff line number Diff line
@@ -193,10 +193,12 @@ 
        <xs:complexContent>

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                <xs:sequence>

                    <xs:element name="Reference" type="etsi:LPID" minOccurs="0"/>

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

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

                    <xs:element name="StatusReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>

                    <xs:element name="StatusReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>

                    <xs:element name="DesiredStatus" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="DesiredStatus" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="RequestDetails" type="LPRequestDetails" minOccurs="0"/>

                    <xs:element name="RequestDetails" type="LPRequestDetails" minOccurs="0"/>

                    <xs:element name="DesiredPreservationExpiration" type="etsi:QualifiedDateTime" minOccurs="0"/>

                    <xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>

                    <xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>

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

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

                </xs:sequence>

                </xs:sequence>
@@ -208,10 +210,8 @@ 
            <xs:element name="Type" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="Type" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="StartTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="StartTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="EndTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="EndTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="ObservedTimes" type="etsi:QualifiedDateTime" minOccurs="0" maxOccurs="unbounded"/>

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

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

            <xs:element name="Subtype" type="RequestSubtype" minOccurs="0"/>

            <xs:element name="Subtype" type="RequestSubtype" minOccurs="0"/>

            <xs:element name="DesiredPreservationExpiration" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

        </xs:sequence>

    </xs:complexType>

    </xs:complexType>

    <xs:complexType name="NationalLPTaskingParameters" abstract="true">

    <xs:complexType name="NationalLPTaskingParameters" abstract="true">

103280/TS_103_280.xsd

+5 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,11 @@ 
        <xs:restriction base="xs:string">

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

            <xs:pattern value="([A-Z]{2}-.+-.+)"/>

            <xs:pattern value="([A-Z]{2}-.+-.+)"/>

        </xs:restriction>

        </xs:restriction>

    </xs:simpleType>

       <xs:simpleType name="LPID">

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

            <xs:pattern value="([A-Z]{2}-.+-.+)"/>

        </xs:restriction>

    </xs:simpleType>

    </xs:simpleType>

    <xs:simpleType name="InternationalizedEmailAddress">

    <xs:simpleType name="InternationalizedEmailAddress">

        <xs:restriction base="ShortString">

        <xs:restriction base="ShortString">