From 7a3fe56cba7233fec72a7303e20a5c99d9965de9 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 18 Mar 2016 23:33:43 +0100
Subject: projects: Allow any order of elements, add keys to restrict
 repetitions

---
 projects.xsd | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/projects.xsd b/projects.xsd
index 9f12329..e6f778b 100644
--- a/projects.xsd
+++ b/projects.xsd
@@ -15,23 +15,27 @@
 			<xs:selector xpath='project/subproject'/>
 			<xs:field xpath='@ref'/>
 		</xs:keyref>
+		<!-- define additional keys to enforce exactly one element
+			 of each kind -->
+		<xs:key name='projectNameKey'>
+			<xs:selector xpath='project'/>
+			<xs:field xpath='name'/>
+		</xs:key>
+		<xs:key name='projectURLKey'>
+			<xs:selector xpath='project'/>
+			<xs:field xpath='url'/>
+		</xs:key>
 	</xs:element>
 
 	<xs:complexType name='projectType'>
-		<xs:sequence>
-			<xs:element name='email' type='emailType'
-				minOccurs='1' maxOccurs='1'/>
-			<xs:element name='name' type='xs:token'
-				minOccurs='0' maxOccurs='1'/>
-			<xs:element name='url' type='urlType'
-				minOccurs='0' maxOccurs='1'/>
-			<xs:element name='description' type='xs:token'
-				minOccurs='0' maxOccurs='1'/>
-			<xs:element name='subproject' type='subprojectType'
-				minOccurs='0' maxOccurs='unbounded'/>
-			<xs:element name='member' type='memberType'
-				minOccurs='0' maxOccurs='unbounded'/>
-		</xs:sequence>
+		<xs:choice minOccurs='0' maxOccurs='unbounded'>
+			<xs:element name='email' type='emailType'/>
+			<xs:element name='name' type='xs:token'/>
+			<xs:element name='url' type='urlType'/>
+			<xs:element name='description' type='xs:token'/>
+			<xs:element name='subproject' type='subprojectType'/>
+			<xs:element name='member' type='memberType'/>
+		</xs:choice>
 	</xs:complexType>
 
 	<xs:complexType name='subprojectType'>
-- 
cgit v1.2.3-65-gdbad