Skip to content

Fix #4, #7, #9 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zanaptak wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix #4, #7, #9 #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1f54b4
Avoid attribute swap during compare. Fixes #9.
zanaptak Jul 31, 2020
d4d21e1
Handle null attribute list. Fixes #7.
zanaptak Aug 3, 2020
981ad09
Avoid initial reversing of node list. Fixes #4.
zanaptak Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static void SortNodes( XmlNode node )
var nodes = new List<XmlNode>(node.ChildNodes.Count);

for (var i = node.ChildNodes.Count - 1; i >= 0; i--) {
nodes.Add(node.ChildNodes[i]);
nodes.Insert(0, node.ChildNodes[i]);
node.RemoveChild(node.ChildNodes[i]);
}

Expand All @@ -187,30 +187,31 @@ static int SortDelegate( XmlNode a, XmlNode b )
// Sorting attributes, if specified, is done before node sorting happens..

if (result == 0) {
var col1 = (a.Attributes.Count >= b.Attributes.Count) ? a.Attributes : b.Attributes;
var col2 = (a.Attributes.Count >= b.Attributes.Count) ? b.Attributes : a.Attributes;

for (var i = 0; i < col1.Count; i++) {
if (i < col2.Count) {
var aa = col1[i];
var bb = col2[i];
result = string.Compare(aa.Name, bb.Name, sort_attr_comp);
if (result == 0) {
result = string.Compare(aa.Value, bb.Value, sort_attr_comp);
if (result != 0) {
return result;
}
// Attribute name and value match.. continue loop.
} else {
var aCount = a.Attributes?.Count ?? 0;
var bCount = b.Attributes?.Count ?? 0;
var sharedCount = Math.Min(aCount, bCount);

for (var i = 0; i < sharedCount; i++) {
var aa = a.Attributes[i];
var bb = b.Attributes[i];
result = string.Compare(aa.Name, bb.Name, sort_attr_comp);
if (result == 0) {
result = string.Compare(aa.Value, bb.Value, sort_attr_comp);
if (result != 0) {
return result;
}
// Attribute name and value match.. continue loop.
} else {
return 1;
return result;
}
}

// If we get here, that means that the node's attributes (and values) all match..
// TODO: Should we go down into the child node collections for sorting?
// If we get here, that means that the node's attributes (and values) all match, up to lesser count..

// Compare by count (meaing node with fewer attributes will sort first)
return aCount.CompareTo(bCount);

// TODO: Should we go down into the child node collections for sorting, if equal attribute count?
// See example `c.xml`..
//Console.WriteLine(a.Name + "==" + b.Name + " all attributes matched");
}
Expand Down