Skip to content

Match SILNLP's term rendering and gloss cleaning exactly #343

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

Merged
Enkidu93 merged 2 commits into from
Sep 29, 2025
Merged

Match SILNLP's term rendering and gloss cleaning exactly #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88004a
Copy silnlp gloss-cleaning functions exactly; separate rendering and …
Enkidu93 Sep 29, 2025
b5a6bdf
Separate terms and glosses tests
Enkidu93 Sep 29, 2025
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
36 changes: 24 additions & 12 deletions src/SIL.Machine/Corpora/ParatextProjectTermsParserBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ protected ParatextProjectTermsParserBase(ParatextProjectSettingsParserBase setti
.Select(kvp =>
{
string id = kvp.Item1.Replace("\n", "&#xA");
string gloss = kvp.Item2.Element("Renderings").Value;
IReadOnlyList<string> glosses = GetGlosses(gloss);
return (id, glosses);
string rendering = kvp.Item2.Element("Renderings").Value;
IReadOnlyList<string> renderings = GetRenderings(rendering);
return (id, renderings);
})
.GroupBy(kvp => kvp.Item1, kvp => kvp.Item2) //Handle duplicate term ids (which do exist) e.g. שִׁלֵּמִי
.Select(grouping => (grouping.Key, grouping.SelectMany(g => g)))
Expand Down Expand Up @@ -202,27 +202,39 @@ IDictionary<string, ImmutableHashSet<VerseRef>> termIdToReferences
);
}

private static string CleanTerm(string term)
{
term = term.Trim();
term = StripParens(term);
term = string.Join(" ", term.Split());
return term;
}

public static IReadOnlyList<string> GetGlosses(string gloss)
{
//If entire term rendering is surrounded in square brackets, remove them
Match match = ContentInBracketsRegex.Match(gloss);
if (match.Success)
gloss = match.Groups[0].Value;
gloss = match.Groups[1].Value;
gloss = gloss.Replace("?", "");
gloss = gloss.Replace("*", "");
gloss = gloss.Replace("/", " ");
gloss = gloss.Trim();
gloss = StripParens(gloss);
gloss = CleanTerm(gloss);
gloss = StripParens(gloss, left: '[', right: ']');
gloss = gloss.Trim();
foreach (Match m in NumericalInformationRegex.Matches(gloss))
{
gloss.Replace(m.Value, "");
}
IEnumerable<string> glosses = Regex.Split(gloss, @"\|\|");
glosses = glosses.SelectMany(g => g.Split(new char[] { ',', ';' }));
glosses = glosses.Select(g => g.Trim()).Where(s => s != "").Distinct().ToList();
return (IReadOnlyList<string>)glosses;
return Regex.Split(gloss, @"[;,/]").Select(g => g.Trim()).Where(s => s != "").Distinct().ToList();
}

public static IReadOnlyList<string> GetRenderings(string rendering)
{
return Regex
.Split(rendering.Trim(), @"\|\|")
.Select(r => CleanTerm(r).Trim())
.Select(r => r.Replace("*", ""))
.Where(r => r != "")
.ToList();
}

/// <summary>
Expand Down
15 changes: 11 additions & 4 deletions tests/SIL.Machine.Tests/Corpora/ParatextProjectTermsParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,24 @@ public void TestStripParens(string testString, string expectedOutput, char left

[Test]
[TestCase("", new string[] { })]
[TestCase("*Abba* /", new string[] { "Abba" })]
[TestCase("Abba|| ", new string[] { "Abba" })]
[TestCase("Abba||Abbah?", new string[] { "Abba", "Abbah" })]
[TestCase("Abba (note)", new string[] { "Abba" })]
[TestCase("Abba (note)", new string[] { "Abba" })]
[TestCase("Ahasuerus, Xerxes; Assuerus", new string[] { "Ahasuerus", "Xerxes", "Assuerus" })]
public void TestGetGlosses(string glossString, IReadOnlyList<string> expectedOutput)
{
Assert.That(ParatextProjectTermsParserBase.GetGlosses(glossString), Is.EqualTo(expectedOutput));
}

[Test]
[TestCase("", new string[] { })]
[TestCase("*Abba*", new string[] { "Abba" })]
[TestCase("Abba|| ", new string[] { "Abba" })]
[TestCase("Abba||Abbah", new string[] { "Abba", "Abbah" })]
[TestCase("Abba (note)", new string[] { "Abba" })]
public void TestGetRenderings(string renderingString, IReadOnlyList<string> expectedOutput)
{
Assert.That(ParatextProjectTermsParserBase.GetRenderings(renderingString), Is.EqualTo(expectedOutput));
}

private class TestEnvironment(
ParatextProjectSettings? settings = null,
Dictionary<string, string>? files = null,
Expand Down
Loading