Skip to content

Commit

Permalink
default to major biblical terms (#180)
Browse files Browse the repository at this point in the history
* default to major biblical terms - sillsdev/serval#357
Update tests - target-1 does not include BiblicalTermsListSetting to invoke default.

* fix
  • Loading branch information
johnml1135 authored Apr 10, 2024
1 parent 293bbdf commit fa65835
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
15 changes: 13 additions & 2 deletions src/SIL.Machine/Corpora/ParatextProjectSettingsParserBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,19 @@ public ParatextProjectSettings Parse()
suffix = postPart;
}

string biblicalTerms = settingsDoc.Root.Element("BiblicalTermsListSetting").Value;
string[] parts = biblicalTerms.Split(new[] { ':' }, 3);
string biblicalTermsListSetting = settingsDoc.Root.Element("BiblicalTermsListSetting")?.Value;
if (biblicalTermsListSetting == null)
// Default to Major::BiblicalTerms.xml to mirror Paratext behavior
biblicalTermsListSetting = "Major::BiblicalTerms.xml";

string[] parts = biblicalTermsListSetting.Split(new[] { ':' }, 3);
if (parts.Length != 3)
{
throw new InvalidOperationException(
$"The BiblicalTermsListSetting element in Settings.xml in project {fullName}"
+ $" is not in the expected format (i.e., Major::BiblicalTerms.xml) but is {biblicalTermsListSetting}."
);
}

return new ParatextProjectSettings(
name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<FileNameBookNameForm>41MAT</FileNameBookNameForm>
<FileNamePrePart />
<FileNamePostPart>Ten.SFM</FileNamePostPart>
<BiblicalTermsListSetting>Major::BiblicalTerms.xml</BiblicalTermsListSetting>
<MatchBasedOnStems>F</MatchBasedOnStems>
<AllowReadAccess>F</AllowReadAccess>
<AllowSharingWithSLDR>F</AllowSharingWithSLDR>
Expand Down

0 comments on commit fa65835

Please sign in to comment.