By mistake some changes that should have been in 4.1 did not make it …

…to the last commit. This is fixed in this version.
june-ab · Jan 13, 2016 · 0da73ea · 0da73ea
1 parent 40fe1ab
commit 0da73ea
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 30 deletions.
diff --git a/content.xsd b/content.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014, 2015 -->
+<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://common.tv.se/content/v4_1"
 	targetNamespace="http://common.tv.se/content/v4_1" elementFormDefault="qualified"
 	attributeFormDefault="unqualified" version="1.0">
@@ -180,7 +180,7 @@
 		<xs:sequence>
 			<xs:element name="title" type="originalTitleType"
 				maxOccurs="unbounded" />
-			<xs:element name="titleId" type="xs:string" minOccurs="0" />
+			<xs:element name="titleId" type="xs:string" minOccurs="1" />
 
 		</xs:sequence>
 	</xs:complexType>
@@ -222,14 +222,37 @@
 	</xs:complexType>
 	<xs:complexType name="genreListType">
 		<xs:sequence>
-			<xs:element name="genre" type="genreType" minOccurs="0"
+			<xs:element name="genre" type="genreType" minOccurs="1"
 				maxOccurs="50" />
 		</xs:sequence>
 	</xs:complexType>
-
 	<xs:complexType name="genreType">
+		<xs:sequence>
+			<xs:element name="genre1" type="xs:string" minOccurs="1"/>
+			<xs:element name="genre2List" type="genre2ListType" minOccurs="0" maxOccurs="1"/>
+		</xs:sequence>
+		<xs:attribute name="priority" type="xs:long">
+			<xs:annotation>
+ 				<xs:documentation>lower priority number means higher importance
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="language" type="xs:language">
+			<xs:annotation>
+				<xs:documentation>code in ISO 639-2</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="type" type="contextType" />          
+	</xs:complexType>
+	<xs:complexType name="genre2ListType">
+		<xs:sequence>
+	 		<xs:element name="genre2" type="genre2Type" minOccurs="1"
+				maxOccurs="50"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="genre2Type">
 		<xs:simpleContent>
-			<xs:extension base="textType">
+			<xs:extension base="xs:string">
 				<xs:attribute name="priority" type="xs:long">
 					<xs:annotation>
 						<xs:documentation>lower priority number means higher importance
@@ -345,9 +368,9 @@
 	</xs:complexType>
 	<xs:complexType name="dvbGenreType">
 		<xs:sequence>
-			<xs:element name="nibble1" type="dvbGenreNibbleType"/>
-			<xs:element name="nibble2" type="dvbGenreNibbleType"/>
-			<xs:element name="userByte" type="userByteType"/>
+			<xs:element name="nibble1" type="dvbGenreNibbleType" nillable="true" minOccurs="1"/>
+			<xs:element name="nibble2" type="dvbGenreNibbleType" nillable="true" minOccurs="1"/>
+			<xs:element name="userByte" type="userByteType" nillable="true" minOccurs="1"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:simpleType name="dvbGenreNibbleType">
@@ -370,7 +393,7 @@
 	</xs:complexType>	
 	<xs:complexType name="ratingType">
 		<xs:sequence>
-			<xs:element name="value" type="xs:float" minOccurs="1"/>
+			<xs:element name="value" type="xs:float" minOccurs="1" nillable="true"/>
 			<xs:element name="source" type="xs:string" minOccurs="1"/>				
 		</xs:sequence>
 		<xs:attribute name="type" type="contextType" default="content"></xs:attribute>
@@ -456,11 +479,20 @@
 							<xs:enumeration value="promotion"></xs:enumeration>
 							<xs:enumeration value="press"></xs:enumeration>
 							<xs:enumeration value="logo"></xs:enumeration>
+							<xs:enumeration value="sportsCategory"></xs:enumeration>
+							<xs:enumeration value="sportsLeague"></xs:enumeration>
+							<xs:enumeration value="sportsHomeTeam"></xs:enumeration>
+							<xs:enumeration value="sportsAwayTeam"></xs:enumeration>
+							<xs:enumeration value="sportsStadium"></xs:enumeration>
 							<xs:enumeration value="other"></xs:enumeration>
 						</xs:restriction>
 					</xs:simpleType>
 				</xs:attribute>
-
+				<xs:attribute name="language" type="xs:language">
+					<xs:annotation>
+						<xs:documentation>code in ISO 639-2</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
@@ -583,9 +615,7 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="sportType">
-		<xs:sequence>
-			<xs:element name="sportsCategoryList" type="sportsCategoryListType"
-				minOccurs="0" />				
+		<xs:sequence>				
 			<xs:element name="leagueOrCompetitionList" type="leagueOrCompetitionListType"
 				minOccurs="0" />
 			<xs:element name="roundOrEpisodeList" type="roundOrEpisodeListType"
@@ -595,19 +625,6 @@
 			<xs:element name="venueList" type="venueListType" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="sportsCategoryListType">
-		<xs:sequence>
-			<xs:element name="sportsCategory" type="sportsCategoryType"
-				minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="sportsCategoryType">
-		<xs:simpleContent>
-			<xs:restriction base="simpleTextType">
-				<xs:maxLength value="40" />
-			</xs:restriction>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:complexType name="leagueOrCompetitionListType">
 		<xs:sequence>
 			<xs:element name="leagueOrCompetition" type="leagueOrCompetitionType"

diff --git a/material.xsd b/material.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014, 2015 -->
+<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns="http://common.tv.se/material/v4_1" targetNamespace="http://common.tv.se/material/v4_1"
 	elementFormDefault="qualified" attributeFormDefault="unqualified"
@@ -190,7 +190,7 @@
 	</xs:simpleType>
 	<xs:complexType name="accessibilityListType">
 		<xs:sequence>
-			<xs:element name="accessibilityList" type="accessibilityType"
+			<xs:element name="accessibility" type="accessibilityType"
 				minOccurs="0" maxOccurs="unbounded">
 				<xs:annotation>
 					<xs:documentation>reference to a accessibility item, for example a

diff --git a/publish.xsd b/publish.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014, 2015 -->
+<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:content="http://common.tv.se/content/v4_1" xmlns:material="http://common.tv.se/material/v4_1"
 	xmlns:event="http://common.tv.se/event/v4_1" xmlns="http://common.tv.se/publish/v4_1"

diff --git a/schedule.xsd b/schedule.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014, 2015 -->
+<!--Document developed by TeliaSonera, SVT and TV4 2009, 2010, 2011, 2014 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:content="http://common.tv.se/content/v4_1" xmlns:event="http://common.tv.se/event/v4_1"
 	xmlns:material="http://common.tv.se/material/v4_1" xmlns="http://common.tv.se/schedule/v4_1"