From 865357bbc8cd6c9ee8828e35d87b513d32bb0bd9 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 25 Nov 2024 10:15:13 -0700 Subject: [PATCH] Bug Fix: Forgot to set LastHeader --- Adaptation/.vscode/settings.json | 1 + Adaptation/FileHandlers/QS408M/Complete.cs | 2 +- Adaptation/FileHandlers/QS408M/FileRead.cs | 1 + Adaptation/FileHandlers/QS408M/Header.cs | 12 ++++++------ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index 052c51a..9c69b0b 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -12,6 +12,7 @@ "Hmmssffff", "ipdsf", "ISMTP", + "kanbn", "MEPI", "messa", "ntities", diff --git a/Adaptation/FileHandlers/QS408M/Complete.cs b/Adaptation/FileHandlers/QS408M/Complete.cs index 720dbc9..1a4cf0f 100644 --- a/Adaptation/FileHandlers/QS408M/Complete.cs +++ b/Adaptation/FileHandlers/QS408M/Complete.cs @@ -69,7 +69,7 @@ internal class Complete Complete? result; int[] i = new int[] { 0 }; string text = File.ReadAllText(logistics.ReportFullPath); - Header? header = Header.Get(lastHeader[0], text, i); + Header? header = Header.Get(lastHeader, text, i); if (header is null) result = null; else diff --git a/Adaptation/FileHandlers/QS408M/FileRead.cs b/Adaptation/FileHandlers/QS408M/FileRead.cs index 8e53f48..62e3983 100644 --- a/Adaptation/FileHandlers/QS408M/FileRead.cs +++ b/Adaptation/FileHandlers/QS408M/FileRead.cs @@ -133,6 +133,7 @@ public class FileRead : Shared.FileRead, IFileRead if (iProcessData.Details.Count == 0) throw new Exception(string.Concat("C) No Data - ", dateTime.Ticks)); results = iProcessData.GetResults(this, _Logistics, results.Item4); + _LastHeader[0] = complete.Header; } return results; } diff --git a/Adaptation/FileHandlers/QS408M/Header.cs b/Adaptation/FileHandlers/QS408M/Header.cs index 2cd1ea3..441555d 100644 --- a/Adaptation/FileHandlers/QS408M/Header.cs +++ b/Adaptation/FileHandlers/QS408M/Header.cs @@ -38,7 +38,7 @@ public class Header false, string.Empty); - internal static Header? Get(Header lastHeader, string text, int[] i) + internal static Header? Get(Header[] lastHeader, string text, int[] i) { Header? result; // occasionally there are multiple blocks of details, get the last one as earlier ones may be aborted runs. @@ -78,11 +78,11 @@ public class Header usedLast = false; else { - title = lastHeader.Title; - recipe = lastHeader.Recipe; - @operator = lastHeader.Operator; - batch = lastHeader.Batch; - cassette = lastHeader.Cassette; + title = lastHeader[0].Title; + recipe = lastHeader[0].Recipe; + @operator = lastHeader[0].Operator; + batch = lastHeader[0].Batch; + cassette = lastHeader[0].Cassette; usedLast = true; } result = new(title: title,