Fix #1074 and part of #1075 (#1089)

paranext · Aug 26, 2024 · 66b7662 · 66b7662
1 parent 2cf01cb
commit 66b7662
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/c-sharp/Checks/CheckResultsRecorder.cs b/c-sharp/Checks/CheckResultsRecorder.cs
@@ -29,7 +29,7 @@ public void RecordError(
     {
         var chapterVerse = token.ScrRefString.Split(":");
         int chapterNumber = int.Parse(chapterVerse[0]);
-        int verseNumber = int.Parse(chapterVerse[1]);
+        int verseNumber = GetVerseNumber(chapterVerse[1]);
         VerseRef verseRef = new (CurrentBookNumber, chapterNumber, verseNumber);
         CheckRunResults.Add(new CheckRunResult(
             checkId,
@@ -58,4 +58,25 @@ public void RecordError(
     }
 
     public List<CheckRunResult> CheckRunResults { get; } = [];
+
+    private static int GetVerseNumber(string verseNumber)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(verseNumber);
+        if (!IsDigit(verseNumber[0]))
+            throw new ArgumentException($"verseNumber must start with an integer: {verseNumber}");
+
+        int lastIndex = 1;
+        while (lastIndex < verseNumber.Length)
+        {
+            if (!IsDigit(verseNumber[lastIndex]))
+                break;
+            lastIndex++;
+        }
+        return int.Parse(verseNumber[..lastIndex]);
+    }
+
+    private static bool IsDigit(char c)
+    {
+        return c >= '0' && c <= '9';
+    }
 }
diff --git a/c-sharp/Checks/CheckRunner.cs b/c-sharp/Checks/CheckRunner.cs
@@ -149,6 +149,13 @@ private ResponseToRequest GetCheckResults()
         var retVal = new List<CheckRunResult>();
         foreach (var check in _checksByIds.Values)
             retVal.AddRange(check.ResultsRecorder.CheckRunResults);
+        if (retVal.Count > 1000)
+        {
+            var fullCount = retVal.Count;
+            retVal.RemoveRange(1000, fullCount - 1000);
+            retVal.TrimExcess();
+            Console.WriteLine($"Trimming {fullCount} check results to 1000");
+        }
         Console.WriteLine($"Returning {retVal.Count} check results");
         return ResponseToRequest.Succeeded(retVal);
     }