Skip to content
Permalink
Browse files

Nokre endringar i xsd. Har kommentert ut feil-typen (#15) og dublikat…

…melding (#16), samt korrigert namngiving (fixes #14 og fixes #17).
  • Loading branch information...
kjorlaug committed Apr 28, 2014
1 parent 085e5eb commit eef5435a8a4b0f4346b7a4d7fa177901004c2e3f
Showing with 21 additions and 46 deletions.
  1. +21 −46 xsd/sdp-kvittering.xsd
@@ -1,50 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema version="1.0" targetNamespace="http://begrep.difi.no/sdp/schema_v10"
xmlns="http://begrep.difi.no/sdp/schema_v10"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">

<xsd:schema xmlns="http://begrep.difi.no/sdp/schema_v10" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://begrep.difi.no/sdp/schema_v10" elementFormDefault="qualified" version="1.0">
<xsd:include schemaLocation="sdp-melding.xsd"/>


<xsd:element name="kvittering" type="Kvittering"/>


<xsd:complexType name="Kvittering">
<xsd:sequence>
<xsd:element name="tidspunkt" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
<xsd:choice>
<xsd:element name="levertTilPostkasse" type="LevertTilPostkasse"/>
<xsd:element name="aapnetAvMottaker" type="AapnetAvMottaker"/>
<xsd:element name="mottakerVarselFeilet" type="MottakerVarselFeilet"/>
<xsd:element name="duplikatMelding" type="DuplikatMelding"/>
<xsd:element name="feil" type="Feil"/>
<xsd:element name="Levering" type="LeveringType"/>
<xsd:element name="Aapning" type="AapningType"/>
<xsd:element name="Varslingfeilet" type="VarslingfeiletType"/>
<!-- <xsd:element name="duplikatMelding" type="DuplikatMelding"/>
<xsd:element name="feil" type="Feil"/> -->
</xsd:choice>
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="LevertTilPostkasse">
<xsd:complexType name="LeveringType">
<xsd:annotation>
<xsd:documentation>
Postkasseleverandøren garanterer at brevet har eller vil bli levert
til mottakers digitale postkasse.
</xsd:documentation>
</xsd:annotation>
</xsd:complexType>


<xsd:complexType name="AapnetAvMottaker">
<xsd:complexType name="AapningType">
<xsd:annotation>
<xsd:documentation>
Signaliserer at mottaker har åpnet meldingen. Sendes kun dersom
avsender har bestilt åpningskvittering for meldingen.
</xsd:documentation>
</xsd:annotation>
</xsd:complexType>


<xsd:complexType name="DuplikatMelding">
<!-- <xsd:complexType name="DuplikatMelding">
<xsd:annotation>
<xsd:documentation>
Signaliserer at mottaker har åpnet meldingen. Sendes kun dersom
@@ -55,37 +41,29 @@
<xsd:element name="originalKvittering" type="Kvittering"/>
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="MottakerVarselFeilet">
--> <xsd:complexType name="VarslingfeiletType">
<xsd:annotation>
<xsd:documentation>
Signaliserer at et varsel ikke kunne sendes til mottaker.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="type" type="Varseltype" minOccurs="1" maxOccurs="1"/>
<xsd:element name="feilinformasjon" type="Feilinformasjon" minOccurs="1" maxOccurs="1"/>
<xsd:element name="varslingskanal" type="varslingskanalType" minOccurs="1" maxOccurs="1"/>
<xsd:element name="beskrivelse" type="beskrivelseType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<xsd:simpleType name="Varseltype">
<xsd:simpleType name="varslingskanalType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="SMS" />
<xsd:enumeration value="EPOST" />
<xsd:enumeration value="SMS"/>
<xsd:enumeration value="EPOST"/>
</xsd:restriction>
</xsd:simpleType>


<xsd:complexType name="Feil">
<!-- <xsd:complexType name="Feil">
<xsd:sequence>
<xsd:element name="kilde" type="Feilkilde" minOccurs="1" maxOccurs="1" />
<xsd:element name="informasjon" type="Feilinformasjon" minOccurs="0" maxOccurs="1" />
<xsd:element name="kilde" type="Feilkilde" minOccurs="1" maxOccurs="1"/>
<xsd:element name="informasjon" type="Feilinformasjon" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<xsd:simpleType name="Feilkilde">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="KLIENT">
@@ -106,12 +84,9 @@
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>


<xsd:simpleType name="Feilinformasjon">
--> <xsd:simpleType name="beskrivelseType">
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1000" />
<xsd:maxLength value="1000"/>
</xsd:restriction>
</xsd:simpleType>

</xsd:schema>
</xsd:schema>

0 comments on commit eef5435

Please sign in to comment.
You can’t perform that action at this time.