# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1276962605 0
# Node ID 166d01079acf9fe80d2092c7d943235fc47bc540
# Parent  da286069b9c6aca3dcdf8dd3153d45a154be7e39
Re #290: Migrate to using key/keyref definitions instead of ID/IDREF type
 * Make extraData use local keys instead of global IDs
 * Change army to using a string, since we don't care what it is
Also:
 * Implement loading of extra data so we can test it is loaded

diff -r da286069b9c6 -r 166d01079acf api/Factories/Xml/WarFoundryXmlRaceFactory.cs
--- a/api/Factories/Xml/WarFoundryXmlRaceFactory.cs	Mon Jun 14 19:56:10 2010 +0000
+++ b/api/Factories/Xml/WarFoundryXmlRaceFactory.cs	Sat Jun 19 15:50:05 2010 +0000
@@ -376,6 +376,12 @@
 		
 		private void LoadExtraDataForUnitType(XmlElement elem, UnitType type)
 		{
+			foreach (XmlElement extraData in WarFoundryXmlFactoryUtils.SelectNodes(elem, "race:extraData/race:data"))
+			{
+				string id = extraData.GetAttribute("id");
+				string data = extraData.InnerXml;
+				type.AddExtraData(id, data);
+			}
 		}
 		
 		private void LoadNotesForUnitType(XmlElement elem, UnitType type)
diff -r da286069b9c6 -r 166d01079acf schemas/race.xsd
--- a/schemas/race.xsd	Mon Jun 14 19:56:10 2010 +0000
+++ b/schemas/race.xsd	Sat Jun 19 15:50:05 2010 +0000
@@ -59,7 +59,7 @@
 			</xs:element>
 			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
 		</xs:sequence>
-		<xs:attribute name="id" type="xs:ID" />
+		<xs:attribute name="id" type="xs:string" use="required" />
 		<xs:attribute name="subid" type="xs:string" default=""/>
 		<xs:attribute name="name" type="xs:string" use="required"/>
 		<xs:attribute name="system" type="xs:string" use="required"/>
@@ -211,6 +211,10 @@
 				</xs:sequence>
 				<xs:anyAttribute processContents="lax"/>
 			</xs:complexType>
+			<xs:key name="extraDataKey">
+				<xs:selector xpath="race:data"/>
+				<xs:field xpath="@id"/>
+			</xs:key>	
 		</xs:element>
 		<xs:element name="unitMembers" minOccurs="0">
 			<xs:complexType>