Commit 0c98d74e authored by Mark Canterbury's avatar Mark Canterbury Committed by Mark Canterbury
Browse files

Updating dictionaries and aligning names

parent 274fe164

104144/dictionaries/ts_104144_DictionaryDefinitions.xml

+23 −12
Original line number Diff line number Diff line
@@ -232,18 +232,6 @@ 
        <Owner>ETSI</Owner>

        <Name>EPOCDocumentType</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>NoGroundsForRefusal</Value>

                <Meaning>The Enforcing Authority has determined that there are no grounds for refusal.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>PartialGroundsForRefusal</Value>

                <Meaning>The Enforcing Authority has determined that there are partial grounds for refusal.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>FullGroundsForRefusal</Value>

                <Meaning>The Enforcing Authority has determined that there are full grounds for refusal.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>ProceedingToCourt</Value>

                <Meaning>The Issuing Authority, disagreeing with the reasons given in Form 3, is upholding the EPOC and intends to proceed to court.</Meaning>
@@ -378,4 +366,27 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!-- See TS 104 144 table 5.5.4-3 -->

        <Owner>ETSI</Owner>

        <Name>EPOCRefusalType</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>DataProtectedByImmunities</Value>

                <Meaning>Refusal relates to the fact that the data is protected by immunities.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>FundamentalRights</Value>

                <Meaning>Refusal relates to fundamental rights.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>NeBisInIdem</Value>

                <Meaning>Refusal relates to ne bis in idem.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>NotAnOffenceUnderLawOfEnforcingState</Value>

                <Meaning>Refusal relates to the fact that the offence given is not an offence under the law of the enforcing state.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>    

</Dictionaries>

104144/schema/xsd/ts_104144_GroundsForRefusal.xsd

+8 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        <xs:complexContent>

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

                <xs:sequence>

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -31,7 +31,7 @@ 
            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="Epoc_CoreRefusal_Type">

    <xs:complexType name="RefusalInformation">

        <xs:sequence>

            <xs:element name="Ground" type="common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Explanation" type="etsi:LongString" minOccurs="0"/>
@@ -40,19 +40,19 @@ 
    </xs:complexType>

    <xs:complexType name="IdentifierRefusalDecision">

        <xs:choice>

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

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

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

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

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="Epoc_SpecificDataRefusal_Type">

    <xs:complexType name="SpecificDataRefusal">

        <xs:sequence>

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

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

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

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

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="Epoc_CategoriesRefusal_Type">

    <xs:complexType name="CategoriesRefusal">

        <xs:sequence>

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

            <xs:element name="UserIdentificationData" type="CategoryRefusal" minOccurs="0"/>
@@ -62,7 +62,7 @@ 
    </xs:complexType>

    <xs:complexType name="CategoryRefusal">

        <xs:sequence>

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

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

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

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

        </xs:sequence>