Removed save-open-insight-file to use process-data-standard-format instead

Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs

@@ -27,21 +27,18 @@ public class FileRead : Shared.FileRead, IFileRead
         internal string MatchingFile { get; private set; }
         internal string CheckDirectory { get; private set; }
         internal string NoWaitDirectory { get; private set; }
-        internal bool MesEntityMatchesProcess { get; private set; }
 
         internal PreWith(string checkDirectory,
                          string checkFile,
                          string errFile,
                          string matchingFile,
-                         string noWaitDirectory,
-                         bool mesEntityMatchesProcess)
+                         string noWaitDirectory)
         {
             ErrFile = errFile;
             CheckFile = checkFile;
             MatchingFile = matchingFile;
             CheckDirectory = checkDirectory;
             NoWaitDirectory = noWaitDirectory;
-            MesEntityMatchesProcess = mesEntityMatchesProcess;
         }
 
     }
@@ -212,7 +209,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return result;
     }
 
-    private static ReadOnlyCollection<PreWith> GetPreWithCollection(ReadOnlyCollection<Pre> preCollection, bool mesEntityMatchesProcess)
+    private static ReadOnlyCollection<PreWith> GetPreWithCollection(ReadOnlyCollection<Pre> preCollection)
     {
         List<PreWith> results = new();
         string errFile;
@@ -232,8 +229,7 @@ public class FileRead : Shared.FileRead, IFileRead
                           checkFile: pre.CheckFile,
                           errFile: errFile,
                           matchingFile: pre.MatchingFile,
-                          noWaitDirectory: noWaitDirectory,
-                          mesEntityMatchesProcess: mesEntityMatchesProcess);
+                          noWaitDirectory: noWaitDirectory);
             results.Add(preWith);
         }
         return results.AsReadOnly();
@@ -287,7 +283,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return results.AsReadOnly();
     }
 
-    private void MoveCollection(DateTime dateTime, ProcessDataStandardFormat? processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
+    private void MoveCollection(DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
     {
         ReadOnlyCollection<Post> postCollection = GetPostCollection(dateTime, processDataStandardFormat, preWithCollection);
         if (postCollection.Count != 0)
@@ -306,7 +302,7 @@ public class FileRead : Shared.FileRead, IFileRead
         }
     }
 
-    private ReadOnlyCollection<Post> GetPostCollection(DateTime dateTime, ProcessDataStandardFormat? processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
+    private ReadOnlyCollection<Post> GetPostCollection(DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, ReadOnlyCollection<PreWith> preWithCollection)
     {
         List<Post> results = new();
         Post post;
@@ -315,15 +311,10 @@ public class FileRead : Shared.FileRead, IFileRead
         {
             if (!_IsEAFHosted)
                 continue;
-            if (processDataStandardFormat is null)
-                File.Move(preWith.MatchingFile, preWith.CheckFile);
-            else
-            {
-                if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
-                    wsResults = null;
-                ProcessDataStandardFormat.Write(preWith.CheckFile, processDataStandardFormat, wsResults);
-                File.Delete(preWith.MatchingFile);
-            }
+            if (!_StaticRuns.TryGetValue(_Logistics.Sequence, out List<Shared.Metrology.WS.Results>? wsResults))
+                wsResults = null;
+            ProcessDataStandardFormat.Write(preWith.CheckFile, processDataStandardFormat, wsResults);
+            File.Delete(preWith.MatchingFile);
             if (Directory.Exists(preWith.NoWaitDirectory))
             {
                 post = new(preWith.CheckFile, preWith.ErrFile);
@@ -360,7 +351,7 @@ public class FileRead : Shared.FileRead, IFileRead
         ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, _ProcessDataStandardFormatMapping);
         _Logistics = new Logistics(reportFullPath, processDataStandardFormat);
         if (!_IsEAFHosted)
-            ProcessDataStandardFormat.Write(".pdsf", processDataStandardFormat, wsResults: null);
+            ProcessDataStandardFormat.Write("../../.pdsf", processDataStandardFormat, wsResults: null);
         SetFileParameterLotIDToLogisticsMID();
         int numberLength = 2;
         long ticks = dateTime.Ticks;
@@ -375,11 +366,8 @@ public class FileRead : Shared.FileRead, IFileRead
             { CreatePointerFile(numberLength, parentParentDirectory, matchingFiles); }
             catch (Exception) { }
         }
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
-        List<QS408M.Description> descriptions = QS408M.ProcessData.GetDescriptions(jsonElements);
-        bool mesEntityMatchesProcess = descriptions.Count > 0 && descriptions[0].MesEntity == descriptions[0].Reactor;
         ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles);
-        ReadOnlyCollection<PreWith> preWithCollection = GetPreWithCollection(preCollection, mesEntityMatchesProcess);
+        ReadOnlyCollection<PreWith> preWithCollection = GetPreWithCollection(preCollection);
         MoveCollection(dateTime, processDataStandardFormat, preWithCollection);
         return results;
     }

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 
 namespace Adaptation.FileHandlers.OpenInsight;
@@ -18,7 +17,6 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private readonly string _IqsConnectionString;
-    private readonly string _OpenInsightFilePattern;
     private readonly string _OpenInsightApiECDirectory;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<WS.Results>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
@@ -34,7 +32,6 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
         _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
-        _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
         _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.Api.EC.Directory");
     }
 
@@ -113,29 +110,6 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private static string GetLines(List<QS408M.Description> descriptions)
-    {
-        StringBuilder results = new();
-        char del = '\t';
-        QS408M.Description x = descriptions[0];
-        _ = results.Append("Bio-Rad ").Append(x.UniqueId).Append(del).
-            Append(x.Date).Append(del).
-            Append(x.ThicknessFourteenCriticalPointsAverage).Append(del).
-            Append(x.Recipe).Append(del).
-            Append(x.Reactor).Append(del).
-            Append(x.RDS).Append(del).
-            Append(x.PSN).Append(del).
-            Append(x.Layer).Append(del).
-            Append(x.Zone).Append(del).
-            Append(x.Cassette).Append(del).
-            Append(x.Wafer).Append(del).
-            Append(x.RVThickness);
-        for (int i = 0; i < descriptions.Count; i++)
-            _ = results.Append(del).Append(descriptions[i].Position).
-                        Append(del).Append(descriptions[i].Thickness);
-        return results.ToString();
-    }
-
     private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<QS408M.Description> descriptions, Test[] tests)
     {
         bool isDummyRun = false;
@@ -156,33 +130,28 @@ public class FileRead : Shared.FileRead, IFileRead
         string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         if (descriptions.Count != 0 && tests.Length != 0)
         {
-            string lines = GetLines(descriptions);
-            if (!string.IsNullOrEmpty(lines))
+            long? subgroupId;
+            long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
+            long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
+            if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
+                subgroupId = null;
+            else
+                (subgroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
+            if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<WS.Results> wsResults))
             {
-                long? subgroupId;
-                long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
-                long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
-                if (string.IsNullOrEmpty(descriptions[0].Reactor) || string.IsNullOrEmpty(descriptions[0].PSN))
-                    subgroupId = null;
-                else
-                    (subgroupId, int? _, string _) = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
-                if (subgroupId is null)
-                    collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
-                else
-                    collection.Add(new(new ScopeInfo(tests[0], $"{subgroupId.Value} {_OpenInsightFilePattern}"), lines));
-                if (_StaticRuns.TryGetValue(_Logistics.Sequence, out List<WS.Results> wsResults))
-                {
-                    if (wsResults is null || wsResults.Count != 1)
-                        throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
-                    lock (_StaticRuns)
-                        wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
-                }
-                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-                FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, processDataStandardFormat, descriptions.First(), lines, subgroupId, weekOfYear);
+                if (wsResults is null || wsResults.Count != 1)
+                    throw new NullReferenceException($"{nameof(wsResults)} {wsResults?.Count} != 1 {_Logistics.Sequence}!");
+                lock (_StaticRuns)
+                    wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
             }
+            string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+            FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, processDataStandardFormat, descriptions.First(), subgroupId, weekOfYear);
         }
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+        {
+            File.Copy(reportFullPath, duplicateFile, overwrite: true);
             WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
+        }
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)

Adaptation/FileHandlers/OpenInsight/FromIQS.cs

@@ -376,7 +376,7 @@ public class FromIQS
         return result;
     }
 
-    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, QS408M.Description description, string lines, long? subGroupId, string weekOfYear)
+    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, QS408M.Description description, long? subGroupId, string weekOfYear)
     {
         string checkFile;
         string fileName = Path.GetFileName(reportFullPath);
@@ -390,15 +390,9 @@ public class FromIQS
         checkFile = Path.Combine(ecDirectory, fileName);
         if (ecExists && !File.Exists(checkFile))
             File.Copy(reportFullPath, checkFile);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, lines);
         checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json");
         if (ecExists && !File.Exists(checkFile))
             File.WriteAllText(checkFile, json);
-        checkFile = Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.lbl");
-        if (ecExists && !File.Exists(checkFile))
-            File.WriteAllText(checkFile, processDataStandardFormat.Body[processDataStandardFormat.Body.Count - 1]);
     }
 
     private static string GetCommandText(string[] iqsCopyValues)

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -360,6 +360,63 @@ internal class ProcessDataStandardFormat
         return result;
     }
 
+    private static string GetJson(ProcessDataStandardFormat processDataStandardFormat)
+    {
+        if (processDataStandardFormat.InputPDSF is null)
+            throw new NullReferenceException(nameof(processDataStandardFormat.InputPDSF));
+#pragma warning disable CA1845, IDE0057
+        string result;
+        string line;
+        string value;
+        string[] segments;
+        List<string> lines = new();
+        for (int i = 0; i < processDataStandardFormat.InputPDSF.Body.Count; i++)
+        {
+            line = "{";
+            segments = processDataStandardFormat.InputPDSF.Body[i].Trim().Split('\t');
+            if (segments.Length != processDataStandardFormat.InputPDSF.Columns.Count)
+                break;
+            for (int c = 0; c < segments.Length; c++)
+            {
+                value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\");
+                line += string.Concat('"', processDataStandardFormat.InputPDSF.Columns[c].Trim('"'), '"', ':', '"', value, '"', ',');
+            }
+            line = string.Concat(line.Substring(0, line.Length - 1), '}');
+            lines.Add(line);
+        }
+        result = string.Concat(
+            '{',
+            Environment.NewLine,
+            '"',
+            "Count",
+            '"',
+            ": ",            
+            processDataStandardFormat.Body.Count,
+            ',',
+            Environment.NewLine,
+            '"',
+            "Records",
+            '"',
+            ": ",
+            Environment.NewLine,
+            '[',
+            Environment.NewLine,
+            string.Join($",{Environment.NewLine}", lines),
+            Environment.NewLine,
+            ']',
+            ',',
+            Environment.NewLine,
+            '"',
+            "Sequence",
+            '"',
+            ": ",            
+            processDataStandardFormat.Sequence,
+            Environment.NewLine,
+            '}');
+        return result;
+#pragma warning restore CA1845, IDE0057
+    }
+
     internal static void Write(string path, ProcessDataStandardFormat processDataStandardFormat, List<Metrology.WS.Results>? wsResults)
     {
         List<string> results = new();
@@ -399,9 +456,10 @@ internal class ProcessDataStandardFormat
                     results.Add($"{segments[0]}\t{segments[1][0]}_HeaderId={wsResults[0].HeaderId};{segments[1][0]}_SubgroupId={wsResults[0].SubgroupId};{segments[1]}");
             }
         }
-        results.Add("EOF");
+        results.Add("END_HEADER");
         if (processDataStandardFormat.InputPDSF is not null)
         {
+            results.Add(string.Empty);
             List<char> hyphens = new();
             results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => l.Replace('\t', '|')));
             results.Add(string.Empty);
@@ -412,6 +470,11 @@ internal class ProcessDataStandardFormat
             results.AddRange(processDataStandardFormat.InputPDSF.Body.Select(l => l.Replace('\t', '|')));
             results.Add(string.Empty);
             results.AddRange(processDataStandardFormat.InputPDSF.Footer.Select(l => l.Replace('\t', '|')));
+            results.Add(string.Empty);
+            results.Add("EOF");
+            results.Add(string.Empty);
+            string json = GetJson(processDataStandardFormat);
+            results.Add(json);
         }
         File.WriteAllText(path, string.Join(Environment.NewLine, results));
     }

Adaptation/_Tests/Extract/Production/v2.59.0/BIORAD2.cs

@@ -59,7 +59,7 @@ public class BIORAD2
         NonThrowTryCatch();
     }
 
-#if !DEBUG
+#if DEBUG
     [Ignore]
 #endif
     [TestMethod]