Added description in the event element, with purpose to store a text

that is only applicable for this particular transmission (not belonging to the program) Modified timelist type.
june-ab · Sep 13, 2015 · a37a357 · a37a357
1 parent be5e127
commit a37a357
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 54 deletions.
diff --git a/content.xsd b/content.xsd
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Document developed by SVT and TV4 2009, 2010, 2011-->
-<xs:schema 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns="http://common.tv.se/content/v3_0" 
-	targetNamespace="http://common.tv.se/content/v3_0" 
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" 
-	version="3.0">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://common.tv.se/content/v3_1" targetNamespace="http://common.tv.se/content/v3_1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1">
 	<xs:element name="content" type="contentType">
 		<xs:annotation>
 			<xs:documentation>Root element for content object</xs:documentation>

diff --git a/event.xsd b/event.xsd
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Document developed by SVT and TV4 2009, 2010, 2011 -->
-<xs:schema 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns="http://common.tv.se/event/v3_0" 
-	targetNamespace="http://common.tv.se/event/v3_0" 
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" 
-	version="3.0">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://common.tv.se/event/v3_1" targetNamespace="http://common.tv.se/event/v3_1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1">
 	<xs:element name="event" type="eventType">
 		<xs:annotation>
 			<xs:documentation>root node of event</xs:documentation>
@@ -41,7 +34,12 @@
 					<xs:documentation>indicates if this event is hidden, i.e. if it should be public</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="timeList" type="timeType" maxOccurs="unbounded"/>
+			<xs:element name="description" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>description for the event, should only contain description relative to the event only</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="timeList" type="timeListType" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="embeddedEventType">
@@ -108,6 +106,11 @@
 	<xs:simpleType name="timecode">
 		<xs:restriction base="xs:string"/>
 	</xs:simpleType>
+	<xs:complexType name="timeListType">
+		<xs:sequence>
+			<xs:element name="time" type="timeType" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="timeType">
 		<xs:sequence>
 			<xs:element name="startTime" type="xs:dateTime"/>

diff --git a/material.xsd b/material.xsd
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Document developed by SVT and TV4 2009, 2010, 2011-->
-<xs:schema 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns="http://common.tv.se/material/v3_0" 
-	targetNamespace="http://common.tv.se/material/v3_0" 
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" 
-	version="3.0">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://common.tv.se/material/v3_1" targetNamespace="http://common.tv.se/material/v3_1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1">
 	<xs:element name="material" type="materialType">
 		<xs:annotation>
 			<xs:documentation>Root element for material object</xs:documentation>
@@ -188,7 +181,6 @@
 						<xs:restriction base="xs:string"/>
 					</xs:simpleType>
 				</xs:attribute>
-
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>

diff --git a/publish.xsd b/publish.xsd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Document developed by SVT and TV4 2009, 2010, 2011-->
-<xs:schema 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns:content="http://common.tv.se/content/v3_0" 
-	xmlns:material="http://common.tv.se/material/v3_0" 
-	xmlns:event="http://common.tv.se/event/v3_0" 
-	xmlns="http://common.tv.se/publish/v3_0" 
-	targetNamespace="http://common.tv.se/publish/v3_0" 
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" 
-	version="3.0">
-
-	<xs:import namespace="http://common.tv.se/content/v3_0" schemaLocation="content.xsd"/>
-	<xs:import namespace="http://common.tv.se/material/v3_0" schemaLocation="material.xsd"/>
-	<xs:import namespace="http://common.tv.se/event/v3_0" schemaLocation="event.xsd"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:content="http://common.tv.se/content/v3_1" xmlns:material="http://common.tv.se/material/v3_1" xmlns:event="http://common.tv.se/event/v3_1" xmlns="http://common.tv.se/publish/v3_1" targetNamespace="http://common.tv.se/publish/v3_1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1">
+	<xs:import namespace="http://common.tv.se/content/v3_1" schemaLocation="content.xsd"/>
+	<xs:import namespace="http://common.tv.se/material/v3_1" schemaLocation="material.xsd"/>
+	<xs:import namespace="http://common.tv.se/event/v3_1" schemaLocation="event.xsd"/>
 	<xs:element name="publish">
 		<xs:annotation>
 			<xs:documentation>root node of publish</xs:documentation>

diff --git a/schedule.xsd b/schedule.xsd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Document developed by SVT and TV4 2009, 2010, 2011-->
-<xs:schema 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns:content="http://common.tv.se/content/v3_0" 
-	xmlns:event="http://common.tv.se/event/v3_0" 
-	xmlns:material="http://common.tv.se/material/v3_0" 
-	xmlns="http://common.tv.se/schedule/v3_0" 
-	targetNamespace="http://common.tv.se/schedule/v3_0" 
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" 
-	version="3.0">
-
-	<xs:import namespace="http://common.tv.se/content/v3_0" schemaLocation="content.xsd"/>
-	<xs:import namespace="http://common.tv.se/event/v3_0" schemaLocation="event.xsd"/>
-	<xs:import namespace="http://common.tv.se/material/v3_0" schemaLocation="material.xsd"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:content="http://common.tv.se/content/v3_1" xmlns:event="http://common.tv.se/event/v3_1" xmlns:material="http://common.tv.se/material/v3_1" xmlns="http://common.tv.se/schedule/v3_1" targetNamespace="http://common.tv.se/schedule/v3_1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1">
+	<xs:import namespace="http://common.tv.se/content/v3_1" schemaLocation="content.xsd"/>
+	<xs:import namespace="http://common.tv.se/event/v3_1" schemaLocation="event.xsd"/>
+	<xs:import namespace="http://common.tv.se/material/v3_1" schemaLocation="material.xsd"/>
 	<xs:element name="schedule">
 		<xs:annotation>
 			<xs:documentation>root node of schedule, always complete</xs:documentation>