MET08DDUPSFS6420 - v2.43.0 - SPC and APC Bug Fix

Adaptation/FileHandlers/APC/FileRead.cs

@@ -107,16 +107,12 @@ public class FileRead : Shared.FileRead, IFileRead
     {
         bool isDummyRun = false;
         List<(Shared.Properties.IScopeInfo, string)> tuples = new();
-        string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_');
+        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        string duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", segments[0]);
+        string fileNameAfterUnderscoreSplit = GetFileNameAfterUnderscoreSplit(reportFullPath);
-        if (segments.Length > 2)
+        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.TargetFileLocation, fileNameAfterUnderscoreSplit);
-            duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]);
         if (!Directory.Exists(duplicateDirectory))
             _ = Directory.CreateDirectory(duplicateDirectory);
-        string duplicateFile = string.Concat(duplicateDirectory, @"\", Path.GetFileName(reportFullPath));
+        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
-        string successDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\ViewerPath");
-        if (!Directory.Exists(successDirectory))
-            _ = Directory.CreateDirectory(successDirectory);
         File.Copy(reportFullPath, duplicateFile, overwrite: true);
         WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
     }
@@ -130,9 +126,9 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Archive/FileRead.cs

@@ -145,7 +145,8 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        MoveArchive(dateTime);
+        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+            MoveArchive(dateTime);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/Dummy/FileRead.cs

@@ -220,11 +220,11 @@ public class FileRead : Shared.FileRead, IFileRead
             if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.SourceFileLocation)))
                 sourceParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation);
             else
-                sourceParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.SourceFileLocation));
+                sourceParentDirectory = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
             if (!string.IsNullOrEmpty(Path.GetFileName(_FileConnectorConfiguration.TargetFileLocation)))
                 targetParentDirectory = Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation);
             else
-                targetParentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation));
+                targetParentDirectory = GetParentParent(_FileConnectorConfiguration.TargetFileLocation);
             if (sourceParentDirectory != targetParentDirectory)
                 throw new Exception("Target and source must have the same parent for Si Dummy FileConnectorConfiguration!");
             bool check = dateTime.Hour > 7 && dateTime.Hour < 18 && dateTime.DayOfWeek != DayOfWeek.Sunday && dateTime.DayOfWeek != DayOfWeek.Saturday;

Adaptation/FileHandlers/IQSSi/FileRead.cs

@@ -3,6 +3,7 @@ using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration;
 using Adaptation.Shared;
 using Adaptation.Shared.Duplicator;
 using Adaptation.Shared.Methods;
+using Adaptation.Shared.Metrology;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,6 +15,8 @@ namespace Adaptation.FileHandlers.IQSSi;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
+    private readonly string _IQSFile;
+
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
     {
@@ -26,6 +29,7 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
+        _IQSFile = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.File");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -103,6 +107,38 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
+    private void SaveIQSFile(string reportFullPath, DateTime dateTime, List<pcl.Description> descriptions, Test[] tests)
+    {
+        bool isDummyRun = false;
+        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        string lines = OpenInsight.FileRead.GetLines(_Logistics, descriptions);
+        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
+        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
+        if (!Directory.Exists(duplicateDirectory))
+            _ = Directory.CreateDirectory(duplicateDirectory);
+        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        if (tests.Any())
+        {
+            ScopeInfo scopeInfo = new(tests[0], _IQSFile);
+            if (!string.IsNullOrEmpty(lines))
+                tuples.Add(new(scopeInfo, lines));
+        }
+        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+    }
+
+    private void FileCopy(string reportFullPath, DateTime dateTime)
+    {
+        bool isDummyRun = false;
+        string successDirectory = string.Empty;
+        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
+        if (!Directory.Exists(duplicateDirectory))
+            _ = Directory.CreateDirectory(duplicateDirectory);
+        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        File.Copy(reportFullPath, duplicateFile, overwrite: true);
+        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+    }
+
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         if (dateTime == DateTime.MinValue)
@@ -112,9 +148,13 @@ public class FileRead : Shared.FileRead, IFileRead
         _Logistics = new Logistics(reportFullPath, pdsf.Item1);
         SetFileParameterLotIDToLogisticsMID();
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
-        List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
+        List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
+        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+            SaveIQSFile(reportFullPath, dateTime, descriptions, tests);
+        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+            FileCopy(reportFullPath, dateTime);
         return results;
     }
 

Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
 
 namespace Adaptation.FileHandlers.MoveMatchingFiles;
 
@@ -152,8 +153,9 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void MoveCollection(long ticks, List<(string matchingFile, string checkFile)> collection)
+    private void MoveCollection(DateTime dateTime, List<(string matchingFile, string checkFile)> collection)
     {
+        long preWait;
         string errFile;
         string checkDirectory;
         foreach ((string matchingFile, string checkFile) in collection)
@@ -163,35 +165,44 @@ public class FileRead : Shared.FileRead, IFileRead
             if (!Directory.Exists(checkDirectory))
                 _ = Directory.CreateDirectory(checkDirectory);
             File.Move(matchingFile, checkFile);
+            if (_FileConnectorConfiguration?.FileHandleWaitTime is null)
+                preWait = DateTime.Now.AddMilliseconds(1234).Ticks;
+            else
+                preWait = DateTime.Now.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            for (short i = 0; i < short.MaxValue; i++)
+            {
+                if (DateTime.Now.Ticks > preWait)
+                    break;
+                Thread.Sleep(500);
+            }
             for (int i = 0; i < int.MaxValue; i++)
             {
                 if (File.Exists(errFile))
                     throw new Exception(File.ReadAllText(errFile));
                 if (!File.Exists(checkFile))
                     break;
-                if (new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds > _BreakAfterSeconds)
+                if (new TimeSpan(DateTime.Now.Ticks - dateTime.Ticks).TotalSeconds > _BreakAfterSeconds)
                     throw new Exception($"Not all files were consumned after {_BreakAfterSeconds} second(s)!");
+                Thread.Sleep(500);
             }
         }
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
-        if (dateTime == DateTime.MinValue)
-        { }
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
         Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
         _Logistics = new Logistics(reportFullPath, pdsf.Item1);
         SetFileParameterLotIDToLogisticsMID();
         int numberLength = 2;
-        long ticks = DateTime.Now.Ticks;
+        long ticks = dateTime.Ticks;
-        string parentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath));
+        string parentParentDirectory = GetParentParent(reportFullPath);
-        List<string> searchDirectories = GetSearchDirectories(numberLength, parentDirectory);
+        List<string> searchDirectories = GetSearchDirectories(numberLength, parentParentDirectory);
         List<string> matchingFiles = GetMatchingFiles(ticks, reportFullPath, searchDirectories);
         if (matchingFiles.Count != searchDirectories.Count)
             throw new Exception($"Didn't find all files after {_BreakAfterSeconds} second(s)!");
-        List<(string matchingFile, string checkFile)> collection = GetCollection(numberLength, parentDirectory, matchingFiles);
+        List<(string matchingFile, string checkFile)> collection = GetCollection(numberLength, parentParentDirectory, matchingFiles);
-        MoveCollection(ticks, collection);
+        MoveCollection(dateTime, collection);
         return results;
     }
 

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -108,7 +108,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private string GetLines(List<pcl.Description> descriptions)
+    internal static string GetLines(Logistics logistics, List<pcl.Description> descriptions)
     {
         StringBuilder result = new();
         pcl.Description x = descriptions[0];
@@ -222,7 +222,7 @@ public class FileRead : Shared.FileRead, IFileRead
                 Append(x.SumOfDefectsMax).Append(del).                   // 040 - Max Sum of Defects
                 Append(x.SumOfDefectsMin).Append(del).                   // 041 - Min Sum of Defects
                 Append(x.SumOfDefectsStdDev).Append(del).                // 042 - SumOfDefectsStdDev
-                Append(_Logistics.MesEntity).Append(del).           // 043 - 
+                Append(logistics.MesEntity).Append(del).           // 043 - 
                 AppendLine();
         }
         return result.ToString();
@@ -230,28 +230,24 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List<pcl.Description> descriptions, Test[] tests)
     {
-        if (reportFullPath is null)
+        bool isDummyRun = false;
-        { }
+        string lines = GetLines(_Logistics, descriptions);
-        if (dateTime == DateTime.MinValue)
+        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
-        { }
+        string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
+        string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
+        if (parentParent.Contains(_CellInstanceName))
+            parentParent = Path.GetDirectoryName(parentParent);
+        string duplicateDirectory = Path.Combine(parentParent, "Data");
+        if (!Directory.Exists(duplicateDirectory))
+            _ = Directory.CreateDirectory(duplicateDirectory);
+        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         if (tests.Any())
         {
-            bool isDummyRun = false;
-            string lines = GetLines(descriptions);
-            string successDirectory = string.Empty;
             ScopeInfo scopeInfo = new(tests[0], _OpenInsightFilePattern);
-            List<(Shared.Properties.IScopeInfo, string)> tuples = new();
             if (!string.IsNullOrEmpty(lines))
                 tuples.Add(new(scopeInfo, lines));
-            string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_');
-            string duplicateDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\Data");
-            if (segments.Length > 2)
-                duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]);
-            if (!Directory.Exists(duplicateDirectory))
-                _ = Directory.CreateDirectory(duplicateDirectory);
-            string duplicateFile = string.Concat(duplicateDirectory, @"\", Path.GetFileName(reportFullPath));
-            WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
         }
+        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
@@ -263,9 +259,9 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SaveOpenInsightFile(reportFullPath, dateTime, descriptions, tests);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -133,9 +133,9 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SendData(dateTime, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs

@@ -282,14 +282,8 @@ public class WSRequest
 
     internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, string json, List<pcl.Description> descriptions, string matchDirectory)
     {
-        if (fileRead is null)
-        { }
-        if (logistics is null)
-        { }
         if (dateTime == DateTime.MinValue)
         { }
-        if (descriptions is null)
-        { }
         string checkFileName;
         if (string.IsNullOrEmpty(json))
         {

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -141,9 +141,9 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             PostOpenInsightMetrologyViewerAttachments(reportFullPath, dateTime, descriptions);
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/SPaCe/FileRead.cs

@@ -103,6 +103,17 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
+    private void FileCopy(string reportFullPath, DateTime dateTime)
+    {
+        bool isDummyRun = false;
+        string successDirectory = string.Empty;
+        List<(Shared.Properties.IScopeInfo, string)> tuples = new();
+        string duplicateDirectory = _FileConnectorConfiguration.TargetFileLocation;
+        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        File.Copy(reportFullPath, duplicateFile, overwrite: true);
+        WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile);
+    }
+
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         if (dateTime == DateTime.MinValue)
@@ -114,6 +125,8 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
+        if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+            FileCopy(reportFullPath, dateTime);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/ToArchive/FileRead.cs

@@ -1,116 +0,0 @@
-using Adaptation.Eaf.Management.ConfigurationData.CellAutomation;
-using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration;
-using Adaptation.Shared;
-using Adaptation.Shared.Duplicator;
-using Adaptation.Shared.Methods;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace Adaptation.FileHandlers.ToArchive;
-
-public class FileRead : Shared.FileRead, IFileRead
-{
-
-    public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
-        base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
-    {
-        _MinFileLength = 10;
-        _NullData = string.Empty;
-        _Logistics = new(this);
-        if (_FileParameter is null)
-            throw new Exception(cellInstanceConnectionName);
-        if (_ModelObjectParameterDefinitions is null)
-            throw new Exception(cellInstanceConnectionName);
-        if (!_IsDuplicator)
-            throw new Exception(cellInstanceConnectionName);
-    }
-
-    void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
-    {
-        bool isErrorFile = exception is not null;
-        if (!isErrorFile && !string.IsNullOrEmpty(_Logistics.ReportFullPath))
-        {
-            FileInfo fileInfo = new(_Logistics.ReportFullPath);
-            if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime)
-                File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime);
-        }
-        Move(extractResults);
-    }
-
-    void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null);
-
-    string IFileRead.GetEventDescription()
-    {
-        string result = _Description.GetEventDescription();
-        return result;
-    }
-
-    List<string> IFileRead.GetHeaderNames()
-    {
-        List<string> results = _Description.GetHeaderNames();
-        return results;
-    }
-
-    string[] IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, string to, string from, string resolvedFileLocation, Exception exception)
-    {
-        string[] results = Move(extractResults, to, from, resolvedFileLocation, exception);
-        return results;
-    }
-
-    JsonProperty[] IFileRead.GetDefault()
-    {
-        JsonProperty[] results = _Description.GetDefault(this, _Logistics);
-        return results;
-    }
-
-    Dictionary<string, string> IFileRead.GetDisplayNamesJsonElement()
-    {
-        Dictionary<string, string> results = _Description.GetDisplayNamesJsonElement(this);
-        return results;
-    }
-
-    List<IDescription> IFileRead.GetDescriptions(IFileRead fileRead, List<Test> tests, IProcessData processData)
-    {
-        List<IDescription> results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData);
-        return results;
-    }
-
-    Tuple<string, Test[], JsonElement[], List<FileInfo>> IFileRead.GetExtractResult(string reportFullPath, string eventName)
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        if (string.IsNullOrEmpty(eventName))
-            throw new Exception();
-        _ReportFullPath = reportFullPath;
-        DateTime dateTime = DateTime.Now;
-        results = GetExtractResult(reportFullPath, dateTime);
-        if (results.Item3 is null)
-            results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(results.Item1, Array.Empty<Test>(), JsonSerializer.Deserialize<JsonElement[]>("[]"), results.Item4);
-        if (results.Item3.Length > 0 && _IsEAFHosted)
-            WritePDSF(this, results.Item3);
-        UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks);
-        return results;
-    }
-
-    Tuple<string, Test[], JsonElement[], List<FileInfo>> IFileRead.ReExtract()
-    {
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
-        List<string> headerNames = _Description.GetHeaderNames();
-        Dictionary<string, string> keyValuePairs = _Description.GetDisplayNamesJsonElement(this);
-        results = ReExtract(this, headerNames, keyValuePairs);
-        return results;
-    }
-
-    private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
-    {
-        if (dateTime == DateTime.MinValue)
-        { }
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
-        Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
-        _Logistics = new Logistics(reportFullPath, pdsf.Item1);
-        SetFileParameterLotIDToLogisticsMID();
-        return results;
-    }
-
-}

Adaptation/FileHandlers/pcl/ProcessData.cs

@@ -629,16 +629,20 @@ public class ProcessData : IProcessData
         fileInfoCollection.Add(new FileInfo(logistics.ReportFullPath));
     }
 
+#nullable enable
+
     internal static List<Description> GetDescriptions(JsonElement[] jsonElements)
     {
         List<Description> results = new();
-        Description description;
+        Description? description;
         JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
         foreach (JsonElement jsonElement in jsonElements)
         {
             if (jsonElement.ValueKind != JsonValueKind.Object)
                 throw new Exception();
             description = JsonSerializer.Deserialize<Description>(jsonElement.ToString(), jsonSerializerOptions);
+            if (description is null)
+                continue;
             results.Add(description);
         }
         return results;

Adaptation/Shared/FileRead.cs

@@ -618,9 +618,9 @@ public class FileRead : Properties.IFileRead
     {
         string result;
         if (!string.IsNullOrEmpty(Path.GetFileName(directory)))
-            result = Path.GetFullPath(Path.GetDirectoryName(Path.GetDirectoryName(directory)));
+            result = Path.GetFullPath(GetParentParent(directory));
         else
-            result = Path.GetFullPath(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(directory))));
+            result = Path.GetFullPath(GetParentParent(Path.GetDirectoryName(directory)));
         if (!Directory.Exists(result))
             _ = Directory.CreateDirectory(result);
         return result;
@@ -641,6 +641,23 @@ public class FileRead : Properties.IFileRead
         return results;
     }
 
+    internal static string GetFileNameAfterUnderscoreSplit(string reportFullPath)
+    {
+        string result;
+        string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_');
+        if (segments.Length <= 2)
+            result = segments[0];
+        else
+            result = string.Concat(segments[0], segments[2]);
+        return result;
+    }
+
+    internal static string GetParentParent(string value)
+    {
+        string result = Path.GetDirectoryName(Path.GetDirectoryName(value));
+        return result;
+    }
+
 }
 
-// 2022-05-13 -> Shared - FileRead
+// 2022-06-08 -> Shared - FileRead

Adaptation/_Tests/Shared/AdaptationTesting.cs

@@ -954,12 +954,26 @@ public class AdaptationTesting : ISMTP
         }
         if (_TestContext.FullyQualifiedTestClassName.Contains(nameof(Extract)))
         {
-            if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation))
+            if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation))
-                _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation);
+            {
-            if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation))
+                if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation))
-                _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation);
+                    _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation);
-            if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation))
+            }
-                _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation);
+            if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.SourceFileLocation))
+            {
+                if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation))
+                    _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation);
+            }
+            if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.TargetFileLocation))
+            {
+                if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation))
+                    _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation);
+            }
+            if (!string.IsNullOrEmpty(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder))
+            {
+                if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder))
+                    _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.AlternateTargetFolder);
+            }
         }
         result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: false);
         return result;

MET08DDUPSFS6420.csproj

@@ -53,7 +53,6 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -113,7 +112,6 @@
     <Compile Include="Adaptation\FileHandlers\pcl\ProcessData.cs" />
     <Compile Include="Adaptation\FileHandlers\Processed\FileRead.cs" />
     <Compile Include="Adaptation\FileHandlers\SPaCe\FileRead.cs" />
-    <Compile Include="Adaptation\FileHandlers\ToArchive\FileRead.cs" />
     <Compile Include="Adaptation\Ifx\Eaf\Common\Configuration\ConnectionSetting.cs" />
     <Compile Include="Adaptation\Ifx\Eaf\EquipmentConnector\File\Component\File.cs" />
     <Compile Include="Adaptation\Ifx\Eaf\EquipmentConnector\File\Component\FilePathGenerator.cs" />