# HG changeset patch # User IBBoard # Date 1260823839 0 # Node ID f097888efcfe56114e39ebb52d3d5fbad0b26273 # Parent fe5a03d7391827bfc3e90e13ccb663caac930a56 Fixes #233: "unitPoints" attribute is badly named * Rename "unitPoints" to "basePoints" * Re-order schema to more sensible name * Use new name in code when parsing XML (object property already has sensible name) Also: * Rename "dtds" folder to more accurate "schemas" * Change references to folder in code diff -r fe5a03d73918 -r f097888efcfe IBBoard.WarFoundry.API.csproj --- a/IBBoard.WarFoundry.API.csproj Mon Dec 14 20:19:01 2009 +0000 +++ b/IBBoard.WarFoundry.API.csproj Mon Dec 14 20:50:39 2009 +0000 @@ -1,4 +1,4 @@ - + Debug @@ -37,38 +37,7 @@ --> - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - @@ -152,6 +121,42 @@ + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + + + false + PreserveNewest + diff -r fe5a03d73918 -r f097888efcfe api/Factories/Xml/WarFoundryXmlFactoryUtils.cs --- a/api/Factories/Xml/WarFoundryXmlFactoryUtils.cs Mon Dec 14 20:19:01 2009 +0000 +++ b/api/Factories/Xml/WarFoundryXmlFactoryUtils.cs Mon Dec 14 20:50:39 2009 +0000 @@ -67,7 +67,7 @@ settings.ProhibitDtd = true; settings.ValidationEventHandler+= new ValidationEventHandler(ValidationEventMethod); XmlSchemaSet cache = new XmlSchemaSet(); - string path = IBBoard.Constants.ExecutablePath + "/dtds/"; + string path = IBBoard.Constants.ExecutablePath + "/schemas/"; AddSchemaToCache(cache, NS_BASE + "core", path + "warfoundry-core.xsd"); AddSchemaToCache(cache, NS_BASE + "cats", path + "warfoundry-cats.xsd"); AddSchemaToCache(cache, NS_BASE + "race", path + "race.xsd"); diff -r fe5a03d73918 -r f097888efcfe api/Factories/Xml/WarFoundryXmlRaceFactory.cs --- a/api/Factories/Xml/WarFoundryXmlRaceFactory.cs Mon Dec 14 20:19:01 2009 +0000 +++ b/api/Factories/Xml/WarFoundryXmlRaceFactory.cs Mon Dec 14 20:50:39 2009 +0000 @@ -141,7 +141,7 @@ type.MinSize = XmlTools.GetIntValueFromAttribute(elem, "minSize"); type.BaseSize = XmlTools.GetIntValueFromAttribute(elem, "baseSize"); type.CostPerTrooper = XmlTools.GetDoubleValueFromAttribute(elem, "points"); - type.BaseUnitCost = XmlTools.GetDoubleValueFromAttribute(elem, "unitPoints"); + type.BaseUnitCost = XmlTools.GetDoubleValueFromAttribute(elem, "basePoints"); } catch (FormatException ex) { diff -r fe5a03d73918 -r f097888efcfe dtds/army.xsd --- a/dtds/army.xsd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe dtds/race.xsd --- a/dtds/race.xsd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe dtds/system.xsd --- a/dtds/system.xsd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe dtds/warfoundry-cats.xsd --- a/dtds/warfoundry-cats.xsd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe dtds/warfoundry-core.xsd --- a/dtds/warfoundry-core.xsd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe dtds/xhtml-lat1.ent --- a/dtds/xhtml-lat1.ent Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r fe5a03d73918 -r f097888efcfe dtds/xhtml-special.ent --- a/dtds/xhtml-special.ent Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r fe5a03d73918 -r f097888efcfe dtds/xhtml-symbol.ent --- a/dtds/xhtml-symbol.ent Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r fe5a03d73918 -r f097888efcfe dtds/xhtml1-strict.dtd --- a/dtds/xhtml1-strict.dtd Mon Dec 14 20:19:01 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,978 +0,0 @@ - - - - - -%HTMLlat1; - - -%HTMLsymbol; - - -%HTMLspecial; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r fe5a03d73918 -r f097888efcfe schemas/army.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/army.xsd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe schemas/race.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/race.xsd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe schemas/system.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/system.xsd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe schemas/warfoundry-cats.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/warfoundry-cats.xsd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe schemas/warfoundry-core.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/warfoundry-core.xsd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r fe5a03d73918 -r f097888efcfe schemas/xhtml-lat1.ent --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/xhtml-lat1.ent Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fe5a03d73918 -r f097888efcfe schemas/xhtml-special.ent --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/xhtml-special.ent Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fe5a03d73918 -r f097888efcfe schemas/xhtml-symbol.ent --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/xhtml-symbol.ent Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r fe5a03d73918 -r f097888efcfe schemas/xhtml1-strict.dtd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schemas/xhtml1-strict.dtd Mon Dec 14 20:50:39 2009 +0000 @@ -0,0 +1,978 @@ + + + + + +%HTMLlat1; + + +%HTMLsymbol; + + +%HTMLspecial; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +