Skip to content
Permalink
Browse files

litt opprydding i XSD

  • Loading branch information...
tor-kleiberg committed Apr 3, 2014
1 parent 4eb5636 commit cf00612e36030439ebf3781995d8ae4b53855c6c
Showing with 50 additions and 51 deletions.
  1. +16 −23 xsd/sdp-kvittering.xsd
  2. +2 −0 xsd/sdp-manifest.xsd
  3. +32 −28 xsd/sdp-melding.xsd
@@ -12,9 +12,6 @@

<xsd:complexType name="Kvittering">
<xsd:sequence>
<!--
<xsd:element name="refMeldingsId" type="GUID" minOccurs="1" maxOccurs="1"/>
-->
<xsd:choice>
<xsd:element name="levertTilPostkasse" type="LevertTilPostkasse"/>
<xsd:element name="aapnetAvMottaker" type="AapnetAvMottaker"/>
@@ -33,7 +30,8 @@

<xsd:complexType name="Feil">
<xsd:sequence>
<xsd:element name="feilinformasjon" type="Feilinformasjon" minOccurs="1" maxOccurs="1"/>
<xsd:element name="feilType" type="Feiltype" minOccurs="1" maxOccurs="1"/>
<xsd:element name="feilinformasjon" type="Feilinformasjon" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>

@@ -44,7 +42,7 @@


<xsd:complexType name="AvvistAvMottaker">
<!-- TODO: trenger vi denne? -->
<!-- TODO: trenger vi denne for å signalisere at mottaker har valgt å "avvise" et brev med åpningskvittering? -->
</xsd:complexType>


@@ -73,23 +71,18 @@
</xsd:simpleType>


<xsd:complexType name="Feilinformasjon">
<xsd:sequence>
<xsd:element name="feiltype" minOccurs="1" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="detaljer" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1000" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<xsd:simpleType name="Feiltype">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="INPUT" />
<xsd:enumeration value="SERVER" />
</xsd:restriction>
</xsd:simpleType>


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

</xsd:schema>
@@ -12,7 +12,9 @@

<xsd:complexType name="Manifest">
<xsd:sequence>
<!--
<xsd:element name="meldingsId" type="GUID" minOccurs="0" maxOccurs="1"/>
-->
<xsd:element name="mottaker" type="Mottaker" minOccurs="1" maxOccurs="1"/>
<xsd:element name="avsender" type="Avsender" minOccurs="1" maxOccurs="1"/>
<xsd:element name="hoveddokument" type="Dokument" minOccurs="1" maxOccurs="1"/>
@@ -14,32 +14,10 @@


<xsd:complexType name="Melding">

<xsd:sequence>
<xsd:element name="avsender" type="Avsender" minOccurs="1" maxOccurs="1"/>
<xsd:choice>
<xsd:sequence>
<xsd:element name="digitalMottaker" type="Mottaker" minOccurs="1" maxOccurs="1" />
<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
<xsd:element name="aapningskvittering" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false"/>
<xsd:element name="sikkerhetsnivaa" minOccurs="0"
maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:integer">
<xsd:enumeration value="3" />
<xsd:enumeration value="4" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ikkeSensitivHoveddokumenttittel" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="varsler" type="Varsler" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:element name="digitalPostInfo" type="DigitalPostInfo" minOccurs="1" maxOccurs="1" />
<xsd:element name="fysiskPostInfo" type="FysiskPostInfo" minOccurs="1" maxOccurs="1" />
</xsd:choice>
<xsd:element name="dokumentPakke" type="DokumentPakke" minOccurs="1" maxOccurs="1" />
@@ -57,8 +35,10 @@

<xsd:complexType name="Avsender">
<xsd:sequence>
<!--
<xsd:element name="identifier" type="AvsenderOrganisasjon"/>
<xsd:element name="avsenderId" minOccurs="0" maxOccurs="1">
-->
<xsd:element name="avsenderId" minOccurs="1" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
@@ -153,17 +133,16 @@
</xsd:complexType>


<xsd:simpleType name="LandkodeOrgnr">
<xsd:simpleType name="Iso6523Identitet">
<xsd:restriction base="xsd:string">
<!-- hva er mønsteret? -->
<xsd:pattern value="[0-9]{4}:[0-9]{1,20}"/>
<xsd:pattern value="9908:[0-9]{9}"/>
</xsd:restriction>
</xsd:simpleType>


<xsd:complexType name="AvsenderOrganisasjon">
<xsd:simpleContent>
<xsd:extension base="LandkodeOrgnr">
<xsd:extension base="Iso6523Identitet">
<xsd:attribute name="authority" use="optional" default="iso6523-actorid-upis">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
@@ -176,6 +155,31 @@
</xsd:complexType>


<xsd:complexType name="DigitalPostInfo">
<xsd:sequence>
<xsd:element name="digitalMottaker" type="Mottaker" minOccurs="1" maxOccurs="1" />
<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
<xsd:element name="aapningskvittering" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false"/>
<xsd:element name="sikkerhetsnivaa" minOccurs="0"
maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:integer">
<xsd:enumeration value="3" />
<xsd:enumeration value="4" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ikkeSensitivHoveddokumenttittel" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="varsler" type="Varsler" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<!-- typer nedenfor er for fysisk post -->

0 comments on commit cf00612

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