changeset 255:0db25d5d0992

Re #274: crash when missing unitMember id * Try to update schema to require appropriate validation Also: * Remove unused log4net DLL
author IBBoard <dev@ibboard.co.uk>
date Wed, 12 May 2010 20:01:34 +0000
parents cdda78975be1
children 958ecd7b2844
files IBBoard.WarFoundry.API.csproj libs/log4net.dll schemas/race.xsd
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/IBBoard.WarFoundry.API.csproj	Sun May 02 15:45:31 2010 +0000
+++ b/IBBoard.WarFoundry.API.csproj	Wed May 12 20:01:34 2010 +0000
@@ -160,7 +160,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="libs\ICSharpCode.SharpZipLib.dll" />
-    <Content Include="libs\log4net.dll" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IBBoard\IBBoard.csproj">
Binary file libs/log4net.dll has changed
--- a/schemas/race.xsd	Sun May 02 15:45:31 2010 +0000
+++ b/schemas/race.xsd	Wed May 12 20:01:34 2010 +0000
@@ -40,13 +40,17 @@
 								<xs:sequence>
 									<xs:element name="stats" type="stats" minOccurs="0"/>
 								</xs:sequence>
-								<xs:attribute name="id" type="xs:ID" use="required"/>
+								<xs:attribute name="id" type="xs:string" use="required"/>
 								<xs:attribute name="name" type="xs:string" use="required"/>
 								<xs:anyAttribute processContents="lax"/>
 							</xs:complexType>
 						</xs:element>						
 					</xs:sequence>
 				</xs:complexType>
+				<xs:key name="memberTypeID">
+					<xs:selector xpath="memberType"/>
+					<xs:field xpath="@id"/>
+				</xs:key>
 			</xs:element>
 			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
 		</xs:sequence>
@@ -187,9 +191,13 @@
 							<xs:sequence>
 								<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
 							</xs:sequence>
-							<xs:attribute name="typeID" type="xs:IDREF" use="required"/>
+							<xs:attribute name="typeID" type="xs:string" use="required"/>
 							<xs:anyAttribute processContents="lax"/>						
 						</xs:complexType>
+						<xs:keyref name="typeIDRef" refer="memberTypeID">
+							<xs:selector xpath="."/>
+							<xs:field xpath="@typeID"/>
+						</xs:keyref>
 					</xs:element>
 				</xs:sequence>
 			</xs:complexType>