la på språk-attributt på sms-varsel-tekst

endret navn på sdpMeldingId til konversasjonsId oppdaterte xml-eksempler
difi · May 8, 2014 · 58fbdad · 58fbdad
1 parent f43cc66
commit 58fbdad
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 35 deletions.
diff --git a/eksempler/sdpMelding-digital.xml b/eksempler/sdpMelding-digital.xml
@@ -22,14 +22,14 @@
 		<tittel lang="no">Hurra for 17. mai</tittel>
 		<varsler>
 			<epostVarsel>
-				<tekst lang="no">Viktig melding fra Staten i din digital postkasse</tekst>
+				<tekst lang="no">Viktig melding fra Staten i din digitale postkasse</tekst>
 				<repetisjoner>
 					<dagerEtter>0</dagerEtter>
 					<dagerEtter>7</dagerEtter>
 				</repetisjoner>
 			</epostVarsel>
 			<smsVarsel>
-				<tekst>Viktig melding fra Staten</tekst>
+				<tekst lang="no">Viktig melding fra Staten</tekst>
 				<repetisjoner>
 					<dagerEtter>1</dagerEtter>
 				</repetisjoner>

diff --git a/xsd/sdp-felles.xsd b/xsd/sdp-felles.xsd
@@ -8,8 +8,6 @@
 	<xsd:import namespace="http://begrep.difi.no" schemaLocation="oppslag/oppslagstjeneste-metadata-14-05.xsd"/>
 
 
-
-
 	<xsd:complexType name="Avsender">
 		<xsd:sequence>
 			<xsd:element name="organisasjon" type="Organisasjon" minOccurs="1" maxOccurs="1"/>
@@ -29,6 +27,7 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="Organisasjon">
 		<xsd:simpleContent>
 			<xsd:extension base="Iso6523Identitet">
@@ -37,24 +36,19 @@
 		</xsd:simpleContent>
 	</xsd:complexType>
 
-
-
-
-
 	<xsd:complexType name="Mottaker">
 		<xsd:choice>
 			<xsd:element name="person" type="difi:Person"/>
 			<xsd:element name="virksomhet" type="Virksomhet"/>
 		</xsd:choice>
 	</xsd:complexType>
+
 	<xsd:complexType name="Virksomhet">
 		<xsd:sequence>
 			<xsd:element name="sikkerDigitalPostAdresse" type="difi:SikkerDigitalPostAdresse"/>
 		</xsd:sequence>
 	</xsd:complexType>
 
-
-
 	<xsd:simpleType name="Iso6523Identitet">
 		<xsd:annotation>
 			<xsd:documentation>
@@ -77,10 +71,6 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
-
-
-
-
 	<xsd:complexType name="Tittel">
 		<xsd:simpleContent>
 			<xsd:extension base="TittelString">
@@ -95,20 +85,16 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
-
 	<xsd:simpleType name="Spraakkode">
 		<xsd:annotation>
 			<xsd:documentation>
-				Språkkode ihht ISO-639
+				Språkkode ihht ISO-639-1 (2 bokstaver)
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:string">
 			<xsd:minLength value="2"></xsd:minLength>
-			<xsd:maxLength value="5"></xsd:maxLength>
+			<xsd:maxLength value="2"></xsd:maxLength>
 		</xsd:restriction>
 	</xsd:simpleType>
 
-
-
-
 </xsd:schema>
diff --git a/xsd/sdp-melding.xsd b/xsd/sdp-melding.xsd
@@ -7,15 +7,12 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	targetNamespace="http://begrep.difi.no/sdp/schema_v10" elementFormDefault="qualified" version="1.0">
 
-
 	<xsd:include schemaLocation="sdp-felles.xsd"/>
 	<xsd:import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="w3/xenc-schema.xsd"/>
 	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="w3/xmldsig-core-schema.xsd"/>
 	<xsd:import namespace="http://begrep.difi.no" schemaLocation="oppslag/oppslagstjeneste-metadata-14-05.xsd"/>
 
 
-
-
 	<xsd:element name="melding" type="Melding"/>
 	<xsd:complexType name="Melding">
 		<xsd:annotation>
@@ -24,9 +21,9 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="sdpMeldingId" minOccurs="1" maxOccurs="1">
+			<xsd:element name="konversasjonsId" minOccurs="1" maxOccurs="1">
 				<xsd:annotation>
-					<xsd:documentation>Unik meldings-ID for behandlingsansvarlig.</xsd:documentation>
+					<xsd:documentation>ID for forsendelsen. Unik i kontekst av avsender.</xsd:documentation>
 				</xsd:annotation>
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
@@ -68,14 +65,14 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="Dokumentpakke">
 		<xsd:sequence>
 			<xsd:element name="digest" type="ds:ReferenceType" />
 			<xsd:element name="encryptedKey" type="enc:EncryptedKeyType"/>
 		</xsd:sequence>
 	</xsd:complexType>
 
-
 	<xsd:complexType name="DigitalPostInfo">
 		<xsd:sequence>
 			<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
@@ -91,18 +88,21 @@
 			<xsd:element name="varsler" type="Varsler" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:simpleType name="Sikkerhetsnivaa">
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="3"/>
 			<xsd:enumeration value="4"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:complexType name="Varsler">
 		<xsd:sequence>
 			<xsd:element name="epostVarsel" type="EpostVarsel" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="smsVarsel" type="SmsVarsel" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="EpostVarsel">
 		<xsd:sequence>
 			<xsd:element name="tekst" minOccurs="0" maxOccurs="1" type="EpostVarselTekst"/>
@@ -114,16 +114,10 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="SmsVarsel">
 		<xsd:sequence>
-			<xsd:element name="tekst" minOccurs="0" maxOccurs="1">
+			<xsd:element name="tekst" minOccurs="0" maxOccurs="1" type="SmsVarselTekst"/>
-				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:maxLength value="160"/>
-						<xsd:minLength value="1"/>
-					</xsd:restriction>
-				</xsd:simpleType>
-			</xsd:element>
 			<xsd:element name="repetisjoner" type="Repetisjoner" minOccurs="1" maxOccurs="1">
 				<xsd:unique name="UnikeSmsVarselRepetisjoner">
 					<xsd:selector xpath="dagerEtter"/>
@@ -133,7 +127,6 @@
 		</xsd:sequence>
 	</xsd:complexType>
 
-
 	<xsd:complexType name="EpostVarselTekst">
 		<xsd:simpleContent>
 			<xsd:extension base="EpostVarselTekstString">
@@ -148,6 +141,19 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
+	<xsd:complexType name="SmsVarselTekst">
+		<xsd:simpleContent>
+			<xsd:extension base="SmsVarselTekstString">
+				<xsd:attribute name="lang" type="Spraakkode" use="required"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:simpleType name="SmsVarselTekstString">
+		<xsd:restriction base="xsd:string">
+			<xsd:minLength value="1"/>
+			<xsd:maxLength value="160"/>
+		</xsd:restriction>
+	</xsd:simpleType>
 
 
 	<!-- typer nedenfor er for fysisk post -->
@@ -171,6 +177,7 @@
 			<xsd:element name="returadresse" type="NorskPostadresse" minOccurs="1" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="NorskPostadresse">
 		<xsd:sequence>
 			<xsd:element name="adresselinje1" type="Adresselinje" minOccurs="0" maxOccurs="1"/>
@@ -179,6 +186,7 @@
 			<xsd:element name="poststed" type="Poststed" minOccurs="1" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:complexType name="UtenlandskPostadresse">
 		<xsd:sequence>
 			<xsd:element name="adresselinje1" type="Adresselinje" minOccurs="1" maxOccurs="1"/>
@@ -191,31 +199,37 @@
 			</xsd:choice>
 		</xsd:sequence>
 	</xsd:complexType>
+
 	<xsd:simpleType name="Navn">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="130"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:simpleType name="NorskPostnummer">
 		<xsd:restriction base="xsd:string">
 			<xsd:pattern value="\d{4}"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:simpleType name="Adresselinje">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="100"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:simpleType name="Poststed">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="80"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:simpleType name="Land">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="80"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 	<xsd:simpleType name="Landkode">
 		<xsd:annotation>
 			<xsd:documentation>
@@ -227,4 +241,5 @@
 			<xsd:pattern value="[a-zA-Z]{2}"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+
 </xsd:schema>