claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "duplicate" XML entries being used.

Browse Source
This commit is contained in:
Matt Nadareski
2016-03-19 14:18:52 -07:00
parent 7539fc3c69
commit dfe4c4efa4
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DATabase/Importer.cs
View File

@@ -265,18 +265,21 @@ namespace DATabase
// Experimental looping using only XML parsing // Experimental looping using only XML parsing
XmlNode node = doc.FirstChild; XmlNode node = doc.FirstChild;
Console.WriteLine(node.Name);
if (node != null && node.Name == "xml") if (node != null && node.Name == "xml")
{ {
node = node.NextSibling; node = node.NextSibling;
} }
if (node != null && node.Name == "softwarelist") Console.WriteLine(node.Name);
{
node = node.NextSibling;
}
if (node != null && (node.Name == "datafile" || node.Name == "softwarelist")) if (node != null && (node.Name == "datafile" || node.Name == "softwarelist"))
{ {
if (node.NextSibling != null && node.NextSibling.Name == node.Name)
{
node = node.NextSibling;
}
node = node.FirstChild; node = node.FirstChild;
} }
Console.WriteLine(node.Name);
if (node != null && node.Name == "header") if (node != null && node.Name == "header")
{ {
node = node.NextSibling; node = node.NextSibling;
@@ -286,8 +289,16 @@ namespace DATabase
{ {
if (node.Name == "machine" || node.Name == "game" || node.Name == "software") if (node.Name == "machine" || node.Name == "game" || node.Name == "software")
{ {
long gameid = AddGame(sysid, node.Attributes["name"].Value, srcid); long gameid = -1;
if (node.Name == "software")
{
gameid = AddGame(sysid, node.SelectSingleNode("description").InnerText, srcid);
}
else
{
gameid = AddGame(sysid, node.Attributes["name"].Value, srcid);
}
// Get the roms from the machine // Get the roms from the machine
if (node.HasChildNodes) if (node.HasChildNodes)
{ {
@@ -302,10 +313,10 @@ namespace DATabase
gameid, gameid,
child.Attributes["name"].Value, child.Attributes["name"].Value,
date, date,
(child.Attributes["size"].Value != "" ? Int32.Parse(child.Attributes["size"].Value) : -1), (child.Attributes["size"] != null ? Int32.Parse(child.Attributes["size"].Value) : -1),
(child.Attributes["crc"].Value != "" ? child.Attributes["crc"].Value : ""), (child.Attributes["crc"] != null ? child.Attributes["crc"].Value : ""),
(child.Attributes["md5"].Value != "" ? child.Attributes["md5"].Value : ""), (child.Attributes["md5"] != null ? child.Attributes["md5"].Value : ""),
(child.Attributes["sha1"].Value != "" ? child.Attributes["sha1"].Value : "") (child.Attributes["sha1"] != null ? child.Attributes["sha1"].Value : "")
); );
} }
// If we find the signs of a software list, traverse the children // If we find the signs of a software list, traverse the children