diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json index fb93796..11a9e50 100644 --- a/Adaptation/.vscode/tasks.json +++ b/Adaptation/.vscode/tasks.json @@ -78,7 +78,7 @@ "args": [ "/target:Build", "/restore:True", - "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json", + "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json", "/detailedsummary", "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;", "/property:Configuration=Debug;TargetFrameworkVersion=v4.8", diff --git a/Adaptation/FileHandlers/Stratus/FileRead.cs b/Adaptation/FileHandlers/Stratus/FileRead.cs index 8d3ed6d..0a72f0c 100644 --- a/Adaptation/FileHandlers/Stratus/FileRead.cs +++ b/Adaptation/FileHandlers/Stratus/FileRead.cs @@ -115,25 +115,31 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, _OriginalDataBioRad, run, dataText: string.Empty); if (iProcessData is not ProcessData processData) - throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); - string mid; - if (!string.IsNullOrEmpty(processData.Cassette) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) - mid = processData.Cassette; - else if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) - mid = processData.Employee; + results = new(string.Concat("B) No Data - ", dateTime.Ticks), Array.Empty(), Array.Empty(), results.Item4); else { - mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); - mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; + string mid; + if (!string.IsNullOrEmpty(processData.Cassette) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + mid = processData.Cassette; + else if (!string.IsNullOrEmpty(processData.Employee) && string.IsNullOrEmpty(processData.Reactor) && string.IsNullOrEmpty(processData.RDS) && string.IsNullOrEmpty(processData.PSN)) + mid = processData.Employee; + else + { + mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); + mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; + } + SetFileParameterLotID(mid); + _Logistics.Update(mid, processData.Reactor); + if (iProcessData.Details.Count > 0 && iProcessData.Details[0] is Detail detail && string.IsNullOrEmpty(detail.PassFail)) + results.Item4.Add(_Logistics.FileInfo); + else + { + if (iProcessData.Details.Count > 0) + results = iProcessData.GetResults(this, _Logistics, results.Item4); + else + results = new(string.Concat("C) No Data - ", dateTime.Ticks), Array.Empty(), Array.Empty(), results.Item4); + } } - SetFileParameterLotID(mid); - _Logistics.Update(mid, processData.Reactor); - if (iProcessData.Details.Count == 0) - throw new Exception(string.Concat("C) No Data - ", dateTime.Ticks)); - if (iProcessData.Details[0] is Detail detail && string.IsNullOrEmpty(detail.PassFail)) - results.Item4.Add(_Logistics.FileInfo); - else - results = iProcessData.GetResults(this, _Logistics, results.Item4); } return results; } diff --git a/FileHandlers/FileRead.cs b/FileHandlers/FileRead.cs index e30c434..6d0f65b 100644 --- a/FileHandlers/FileRead.cs +++ b/FileHandlers/FileRead.cs @@ -88,6 +88,8 @@ public partial class FileRead : FileReaderHandler, ISMTP try { extractResults = _FileRead.GetExtractResult(reportFullPath, eventName); + if (extractResults.Item3.Length == 0 && !string.IsNullOrEmpty(extractResults.Item1) && !extractResults.Item1.Contains(Environment.NewLine)) + throw new Exception(extractResults.Item1); TriggerEvents(extractResults); _FileRead.Move(extractResults); FilePathGeneratorInfoMove(extractResults);