Improve versification warnings for invalid chapters and verses (#871)

pmachapman · Enkidu93 · web-flow · commit 55e3b1aa1210 · 2026-02-13T15:43:31.000-05:00
* Improve versification warnings for invalid chapters and verses

* Update to machine version 3.8.0

---------

Co-authored-by: Enkidu93 &lt;lowryec17@gcc.edu&gt;
diff --git a/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj b/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj
@@ -38,9 +38,9 @@
 		<PackageReference Include="Hangfire.Mongo" Version="1.13.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.3" />
-		<PackageReference Include="SIL.Machine" Version="3.7.13" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
-		<PackageReference Include="SIL.Machine.Morphology.HermitCrab" Version="3.7.13" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine.Morphology.HermitCrab\SIL.Machine.Morphology.HermitCrab.csproj')" />
-		<PackageReference Include="SIL.Machine.Translation.Thot" Version="3.7.13" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine.Translation.Thot\SIL.Machine.Translation.Thot.csproj')" />
+		<PackageReference Include="SIL.Machine" Version="3.8.0" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
+		<PackageReference Include="SIL.Machine.Morphology.HermitCrab" Version="3.8.0" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine.Morphology.HermitCrab\SIL.Machine.Morphology.HermitCrab.csproj')" />
+		<PackageReference Include="SIL.Machine.Translation.Thot" Version="3.8.0" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine.Translation.Thot\SIL.Machine.Translation.Thot.csproj')" />
 		<PackageReference Include="SIL.WritingSystems" Version="17.0.0" />
 		<PackageReference Include="System.Linq.Async" Version="7.0.0" />
 		<PackageReference Include="YamlDotNet" Version="16.3.0" />
diff --git a/src/Machine/src/Serval.Machine.Shared/Services/PreprocessBuildJob.cs b/src/Machine/src/Serval.Machine.Shared/Services/PreprocessBuildJob.cs
@@ -152,7 +152,15 @@ IReadOnlyList<ParallelCorpus> corpora
                 foreach (UsfmVersificationError error in errors)
                 {
                     warnings.Add(
-                        $"USFM versification error in project {error.ProjectName}, expected verse “{error.ExpectedVerseRef}”, actual verse “{error.ActualVerseRef}”, mismatch type {error.Type} (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})"
+                        error.Type switch
+                        {
+                            UsfmVersificationErrorType.InvalidChapterNumber =>
+                                $"Invalid chapter number error in project {error.ProjectName} at “{error.ActualVerseRef}” (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",
+                            UsfmVersificationErrorType.InvalidVerseNumber =>
+                                $"Invalid verse number error in project {error.ProjectName} at “{error.ActualVerseRef}” (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",
+                            _ =>
+                                $"USFM versification error in project {error.ProjectName}, expected verse “{error.ExpectedVerseRef}”, actual verse “{error.ActualVerseRef}”, mismatch type {error.Type} (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",
+                        }
                     );
                 }
             }
diff --git a/src/Serval/src/Serval.Shared/Serval.Shared.csproj b/src/Serval/src/Serval.Shared/Serval.Shared.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="Grpc.Core.Api" Version="2.76.0" />
 		<PackageReference Include="Grpc.HealthCheck" Version="2.76.0" />
 		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.76.0" />
-		<PackageReference Include="SIL.Machine" Version="3.7.13" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
+		<PackageReference Include="SIL.Machine" Version="3.8.0" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
 		<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.4.0" />
 	</ItemGroup>
 
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj b/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj
@@ -17,7 +17,7 @@
 	  <PackageReference Include="Protobuf.System.Text.Json" Version="1.4.1" />
 	  <PackageReference Include="SIL.WritingSystems" Version="17.0.0" />
 	  <PackageReference Include="SIL.Scripture" Version="17.0.0" />
-	  <PackageReference Include="SIL.Machine" Version="3.7.13" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
+	  <PackageReference Include="SIL.Machine" Version="3.8.0" Condition="!Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
 	</ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,15 @@ IReadOnlyList<ParallelCorpus> corpora`
`152`	`152`	`foreach (UsfmVersificationError error in errors)`
`153`	`153`	`{`
`154`	`154`	`warnings.Add(`
`155`		`- $"USFM versification error in project {error.ProjectName}, expected verse “{error.ExpectedVerseRef}”, actual verse “{error.ActualVerseRef}”, mismatch type {error.Type} (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})"`
	`155`	`+ error.Type switch`
	`156`	`+ {`
	`157`	`+ UsfmVersificationErrorType.InvalidChapterNumber =>`
	`158`	`+ $"Invalid chapter number error in project {error.ProjectName} at “{error.ActualVerseRef}” (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",`
	`159`	`+ UsfmVersificationErrorType.InvalidVerseNumber =>`
	`160`	`+ $"Invalid verse number error in project {error.ProjectName} at “{error.ActualVerseRef}” (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",`
	`161`	`+ _ =>`
	`162`	`+ $"USFM versification error in project {error.ProjectName}, expected verse “{error.ExpectedVerseRef}”, actual verse “{error.ActualVerseRef}”, mismatch type {error.Type} (parallel corpus {parallelCorpus.Id}, monolingual corpus {monolingualCorpusId})",`
	`163`	`+ }`
`156`	`164`	`);`
`157`	`165`	`}`
`158`	`166`	`}`