lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing obsolete TermPart.SortObsolete (and TermsComparer) from Taxonomies

Browse Source
This commit is contained in:
Benedek Farkas
2026-01-07 22:06:02 +01:00
parent 165505b1db
commit 5e8787b1fa
1 changed files with 1 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/Orchard.Web/Modules/Orchard.Taxonomies/Models/TermPart.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
@@ -83,83 +82,5 @@ namespace Orchard.Taxonomies.Models
{
return terms.OrderBy(term => term.FullWeight);
}
[Obsolete]
public static IEnumerable<TermPart> SortObsolete(IEnumerable<TermPart> terms)
{
var list = terms.ToList();
var index = list.ToDictionary(x => x.FullPath);
return list.OrderBy(x => x, new TermsComparer(index));
}
[Obsolete]
private class TermsComparer : IComparer<TermPart>
{
private readonly IDictionary<string, TermPart> _index;
public TermsComparer(IDictionary<string, TermPart> index)
{
_index = index;
}
public int Compare(TermPart x, TermPart y)
{
// if two nodes have the same parent, then compare by weight, then by path
// /1/2/3 vs /1/2/4 => 3 vs 4
if (x.Path == y.Path)
{
var weight = y.Weight.CompareTo(x.Weight);
if (weight != 0)
{
return weight;
}
// if same parent path and same weight, compare by name
return string.Compare(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
}
// if two nodes have different parents
// if the two nodes have the same root, the deeper is after (i.e. one starts with the other)
// /1/2 vs /1/2/3 => /1/2 first
if (x.FullPath.StartsWith(y.FullPath, StringComparison.OrdinalIgnoreCase))
{
return 1;
}
if (y.FullPath.StartsWith(x.FullPath, StringComparison.OrdinalIgnoreCase))
{
return -1;
}
// otherwise compare first none matching parent
// /1/2 vs /1/3 => 2 vs 3
// /2/3 vs /4 => 2 vs 4
var xPath = x.FullPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
var yPath = y.FullPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
string xFullPath = "", yFullPath = "";
for (var i = 0; i < Math.Min(xPath.Length, yPath.Length); i++)
{
xFullPath += "/" + xPath[i];
yFullPath += "/" + yPath[i];
if (!xFullPath.Equals(yFullPath, StringComparison.OrdinalIgnoreCase))
{
var xParent = _index[xFullPath];
var yParent = _index[yFullPath];
return Compare(xParent, yParent);
}
}
return 0;
}
}
}
}
}