From b91c6952a95c90c56dfe7f4dcf49d77c9b8ddd2d Mon Sep 17 00:00:00 2001
From: Peter Chapman <peter@conglomo.co.nz>
Date: Thu, 6 Aug 2026 12:51:03 +1200
Subject: [PATCH] Use correct corpus versification for chapter calculation

---
 .../src/Serval.Translation/Services/ContractMapper.cs    | 9 +--------
 .../src/Serval.WordAlignment/Services/ContractMapper.cs  | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Serval/src/Serval.Translation/Services/ContractMapper.cs b/src/Serval/src/Serval.Translation/Services/ContractMapper.cs
index 47015ec0..8152f303 100644
--- a/src/Serval/src/Serval.Translation/Services/ContractMapper.cs
+++ b/src/Serval/src/Serval.Translation/Services/ContractMapper.cs
@@ -154,11 +154,6 @@ private IReadOnlyList<ParallelCorpusContract> Map(Build build, IReadOnlyList<Par
             TrainingCorpus? trainingCorpus = trainingCorpora?.GetValueOrDefault(source.Id);
             PretranslateCorpus? pretranslateCorpus = pretranslateCorpora?.GetValueOrDefault(source.Id);
 
-            string? referenceFileLocation =
-                source.TargetCorpora.Count > 0 && source.TargetCorpora[0].Files.Count > 0
-                    ? Map(source.TargetCorpora[0].Files[0]).Location
-                    : null;
-
             mappedParallelCorpora.Add(
                 new ParallelCorpusContract
                 {
@@ -171,7 +166,6 @@ .. source.SourceCorpora.Select(sc =>
                                 sc,
                                 trainingCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
                                 pretranslateCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
-                                referenceFileLocation,
                                 trainOnAllCorpora
                                     || (trainingCorpus is not null && trainingCorpus.SourceFilters is null),
                                 pretranslateAllCorpora
@@ -187,7 +181,6 @@ .. source.TargetCorpora.Select(tc =>
                                 tc,
                                 trainingCorpus?.TargetFilters?.Where(sf => sf.CorpusRef == tc.Id).FirstOrDefault(),
                                 null,
-                                referenceFileLocation,
                                 trainOnAllCorpora
                                     || (trainingCorpus is not null && trainingCorpus.TargetFilters is null),
                                 pretranslateAllCorpora || pretranslateCorpus is not null
@@ -205,11 +198,11 @@ private MonolingualCorpusContract Map(
         MonolingualCorpus inputCorpus,
         ParallelCorpusFilter? trainingFilter,
         ParallelCorpusFilter? pretranslateFilter,
-        string? referenceFileLocation,
         bool trainOnAll,
         bool pretranslateAll
     )
     {
+        string? referenceFileLocation = inputCorpus.Files.Count > 0 ? Map(inputCorpus.Files[0]).Location : null;
         Dictionary<string, HashSet<int>>? trainOnChapters = null;
         if (
             trainingFilter is not null
diff --git a/src/Serval/src/Serval.WordAlignment/Services/ContractMapper.cs b/src/Serval/src/Serval.WordAlignment/Services/ContractMapper.cs
index b6e8423e..0e5a6c4a 100644
--- a/src/Serval/src/Serval.WordAlignment/Services/ContractMapper.cs
+++ b/src/Serval/src/Serval.WordAlignment/Services/ContractMapper.cs
@@ -37,11 +37,6 @@ private IReadOnlyList<ParallelCorpusContract> Map(Build build, IReadOnlyList<Par
             TrainingCorpus? trainingCorpus = trainingCorpora?.GetValueOrDefault(source.Id);
             WordAlignmentCorpus? wordAlignOnCorpus = wordAlignOnCorpora?.GetValueOrDefault(source.Id);
 
-            string? referenceFileLocation =
-                source.TargetCorpora.Count > 0 && source.TargetCorpora[0].Files.Count > 0
-                    ? Map(source.TargetCorpora[0].Files[0]).Location
-                    : null;
-
             mappedParallelCorpora.Add(
                 new ParallelCorpusContract
                 {
@@ -54,7 +49,6 @@ .. source.SourceCorpora.Select(sc =>
                                 sc,
                                 trainingCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
                                 wordAlignOnCorpus?.SourceFilters?.Where(sf => sf.CorpusRef == sc.Id).FirstOrDefault(),
-                                referenceFileLocation,
                                 trainOnAllCorpora
                                     || (trainingCorpus is not null && trainingCorpus.SourceFilters is null),
                                 wordAlignOnAllCorpora
@@ -70,7 +64,6 @@ .. source.TargetCorpora.Select(tc =>
                                 tc,
                                 trainingCorpus?.TargetFilters?.Where(sf => sf.CorpusRef == tc.Id).FirstOrDefault(),
                                 null,
-                                referenceFileLocation,
                                 trainOnAllCorpora
                                     || (trainingCorpus is not null && trainingCorpus.TargetFilters is null),
                                 wordAlignOnAllCorpora || wordAlignOnCorpus is not null
@@ -88,11 +81,11 @@ private MonolingualCorpusContract Map(
         MonolingualCorpus inputCorpus,
         ParallelCorpusFilter? trainingFilter,
         ParallelCorpusFilter? wordAlignmentFilter,
-        string? referenceFileLocation,
         bool trainOnAll,
         bool wordAlignOnAll
     )
     {
+        string? referenceFileLocation = inputCorpus.Files.Count > 0 ? Map(inputCorpus.Files[0]).Location : null;
         Dictionary<string, HashSet<int>>? trainOnChapters = null;
         if (
             trainingFilter is not null