diff --git a/Adaptation/FileHandlers/IQSSi/FileRead.cs b/Adaptation/FileHandlers/IQSSi/FileRead.cs index ce8d147..7d0f3d7 100644 --- a/Adaptation/FileHandlers/IQSSi/FileRead.cs +++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text; using System.Text.Json; namespace Adaptation.FileHandlers.IQSSi; @@ -107,11 +108,63 @@ public class FileRead : Shared.FileRead, IFileRead return results; } + private static string GetLines(Logistics logistics, List descriptions) + { + StringBuilder result = new(); + pcl.Description x = descriptions[0]; + char del = '\t'; + _ = result.Append(x.AreaCountAvg).Append(del). // 001 - AreaCountAvg + Append(x.AreaCountMax).Append(del). // 002 - AreaCountMax + Append(x.AreaCountMin).Append(del). // 003 - AreaCountMin + Append(x.AreaCountStdDev).Append(del). // 004 - AreaCountStdDev + Append(x.AreaTotalAvg).Append(del). // 005 - AreaTotalAvg + Append(x.AreaTotalMax).Append(del). // 006 - AreaTotalMax + Append(x.AreaTotalMin).Append(del). // 007 - AreaTotalMin + Append(x.AreaTotalStdDev).Append(del). // 008 - AreaTotalStdDev + Append(x.Date).Append(del). // 009 - + Append(x.HazeAverageAvg).Append(del). // 010 - Haze Average + Append(x.HazeAverageMax).Append(del). // 011 - + Append(x.HazeAverageMin).Append(del). // 012 - + Append(x.HazeAverageStdDev).Append(del). // 013 - + Append(x.HazeRegionAvg).Append(del). // 014 - + Append(x.HazeRegionMax).Append(del). // 015 - + Append(x.HazeRegionMin).Append(del). // 016 - + Append(x.HazeRegionStdDev).Append(del). // 017 - + Append(x.Lot).Append(del). // 018 - + Append(x.LPDCM2Avg).Append(del). // 019 - + Append(x.LPDCM2Max).Append(del). // 020 - + Append(x.LPDCM2Min).Append(del). // 021 - + Append(x.LPDCM2StdDev).Append(del). // 022 - + Append(x.LPDCountAvg).Append(del). // 023 - + Append(x.LPDCountMax).Append(del). // 024 - + Append(x.LPDCM2Min).Append(del). // 025 - + Append(x.LPDCountStdDev).Append(del). // 026 - + Append(x.Employee).Append(del). // 027 - + Append(x.RDS).Append(del). // 028 - Lot + Append(x.Reactor).Append(del). // 029 - Process + Append(x.Recipe.Replace(";", string.Empty)).Append(del). // 030 - Part + Append(x.ScratchCountAvg).Append(del). // 031 - Scratch Count + Append(x.ScratchCountMax).Append(del). // 032 - + Append(x.ScratchCountMin).Append(del). // 033 - + Append(x.ScratchTotalStdDev).Append(del). // 034 - + Append(x.ScratchTotalAvg).Append(del). // 035 - Scratch Length + Append(x.ScratchTotalMax).Append(del). // 036 - + Append(x.ScratchTotalMin).Append(del). // 037 - + Append(x.ScratchTotalStdDev).Append(del). // 038 - + Append(x.SumOfDefectsAvg).Append(del). // 039 - Average Sum of Defects + 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 - + AppendLine(); + return result.ToString(); + } + private void SaveIQSFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) { bool isDummyRun = false; List<(Shared.Properties.IScopeInfo, string)> collection = new(); - string lines = OpenInsight.FileRead.GetLines(_Logistics, descriptions); + string lines = GetLines(_Logistics, descriptions); string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName); if (!Directory.Exists(duplicateDirectory)) diff --git a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs index 2796326..2e419d3 100644 --- a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs +++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs @@ -268,7 +268,7 @@ public class FileRead : Shared.FileRead, IFileRead } } - private static ReadOnlyCollection
 GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection matchingFiles, bool _)
+    private static ReadOnlyCollection
 GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection matchingFiles)
     {
         List
 results = new();
         Pre pre;
@@ -366,10 +366,7 @@ public class FileRead : Shared.FileRead, IFileRead
             { CreatePointerFile(numberLength, parentParentDirectory, matchingFiles); }
             catch (Exception) { }
         }
-        JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
-        List descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
-        bool mesEntityMatchesProcess = descriptions.Count > 0 && descriptions[0].MesEntity == descriptions[0].Reactor;
-        ReadOnlyCollection
 preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles, mesEntityMatchesProcess);
+        ReadOnlyCollection
 preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles);
         ReadOnlyCollection preWithCollection = GetPreWithCollection(preCollection);
         MoveCollection(dateTime, processDataStandardFormat, preWithCollection);
         return results;
diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs
index e860e24..a914738 100644
--- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs
+++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs
@@ -10,7 +10,6 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 
 namespace Adaptation.FileHandlers.OpenInsight;
@@ -20,7 +19,6 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private int _LastIndex;
     private readonly string _IqsConnectionString;
-    private readonly string _OpenInsightFilePattern;
     private readonly string _OpenInsightApiECDirectory;
     private readonly ReadOnlyCollection _IQSCopyCollection;
 
@@ -40,7 +38,6 @@ public class FileRead : Shared.FileRead, IFileRead
         _IQSCopyCollection = new(GetProperties(cellInstanceConnectionName, modelObjectParameters, "IQS.Copy."));
         _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
         _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "API.EC.Directory");
-        _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
     }
 
     void IFileRead.Move(Tuple> extractResults, Exception exception)
@@ -118,126 +115,6 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    internal static string GetLines(Logistics logistics, List descriptions)
-    {
-        StringBuilder result = new();
-        pcl.Description x = descriptions[0];
-        bool ganPPTST = x.Recipe.Contains("GAN_PPTST");
-        if (ganPPTST)
-        {
-            string slot;
-            string reactor;
-            const int eight = 8;
-            DateTime dateTime = DateTime.Parse(x.Date);
-            string lot = x.Lot.ToLower().Replace("69-", string.Empty).Replace("71-", string.Empty).Replace("-", string.Empty);
-            if (string.IsNullOrEmpty(x.Lot) || x.Lot.Length < 2)
-                reactor = "R";
-            else
-                reactor = string.Concat("R", x.Lot.Substring(0, 2));
-            _ = result.Append(nameof(x.Date)).Append(';').
-                  Append("Part").Append(';').
-                  Append(nameof(x.Reactor)).Append(';').
-                  Append("Lot").Append(';').
-                  Append(nameof(pcl.Detail.Slot)).Append(';').
-                  Append(nameof(pcl.Detail.Bin1)).Append(';').
-                  Append(nameof(pcl.Detail.Bin2)).Append(';').
-                  Append(nameof(pcl.Detail.Bin3)).Append(';').
-                  Append(nameof(pcl.Detail.Bin4)).Append(';').
-                  Append(nameof(pcl.Detail.Bin5)).Append(';').
-                  Append(nameof(pcl.Detail.Bin6)).Append(';').
-                  Append("Bin9").
-                  AppendLine();
-            foreach (pcl.Description description in descriptions)
-            {
-                slot = description.Slot.Replace("*", string.Empty);
-                _ = result.Append('!').Append(dateTime.ToString("MM/dd/yyyy HH:mm:ss")).Append(';').
-                      Append("Particle Adder;").
-                      Append(reactor).Append(';').
-                      Append(lot).Append(';').
-                      Append(slot).Append(';').
-                      Append(description.Bin1).Append(';').
-                      Append(description.Bin2).Append(';').
-                      Append(description.Bin3).Append(';').
-                      Append(description.Bin4).Append(';').
-                      Append(description.Bin5).Append(';').
-                      Append(description.Bin6).Append(';').
-                      Append(description.AreaCount).
-                      AppendLine();
-            }
-            if (descriptions.Count != eight)
-            {
-                string negativeTenThousand = "-10000";
-                for (int i = descriptions.Count; i < eight; i++)
-                {
-                    _ = result.Append('!').Append(dateTime.ToString("MM/dd/yyyy HH:mm:ss")).Append(';').
-                         Append("Particle Adder;").
-                         Append(reactor).Append(';').
-                         Append(lot).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).Append(';').
-                         Append(negativeTenThousand).
-                         AppendLine();
-                }
-            }
-            if (result.ToString().Split('\n').Length != (eight + 2))
-                throw new Exception(string.Concat("Must have ", eight, " samples"));
-        }
-        else
-        {
-            char del = '\t';
-            _ = result.Append(x.AreaCountAvg).Append(del).                   // 001 - AreaCountAvg
-                Append(x.AreaCountMax).Append(del).                      // 002 - AreaCountMax
-                Append(x.AreaCountMin).Append(del).                      // 003 - AreaCountMin
-                Append(x.AreaCountStdDev).Append(del).                   // 004 - AreaCountStdDev
-                Append(x.AreaTotalAvg).Append(del).                      // 005 - AreaTotalAvg
-                Append(x.AreaTotalMax).Append(del).                      // 006 - AreaTotalMax
-                Append(x.AreaTotalMin).Append(del).                      // 007 - AreaTotalMin
-                Append(x.AreaTotalStdDev).Append(del).                   // 008 - AreaTotalStdDev
-                Append(x.Date).Append(del).                              // 009 - 
-                Append(x.HazeAverageAvg).Append(del).                    // 010 - Haze Average
-                Append(x.HazeAverageMax).Append(del).                    // 011 - 
-                Append(x.HazeAverageMin).Append(del).                    // 012 - 
-                Append(x.HazeAverageStdDev).Append(del).                 // 013 - 
-                Append(x.HazeRegionAvg).Append(del).                     // 014 - 
-                Append(x.HazeRegionMax).Append(del).                     // 015 - 
-                Append(x.HazeRegionMin).Append(del).                     // 016 - 
-                Append(x.HazeRegionStdDev).Append(del).                  // 017 - 
-                Append(x.Lot).Append(del).                               // 018 - 
-                Append(x.LPDCM2Avg).Append(del).                         // 019 - 
-                Append(x.LPDCM2Max).Append(del).                         // 020 - 
-                Append(x.LPDCM2Min).Append(del).                         // 021 - 
-                Append(x.LPDCM2StdDev).Append(del).                      // 022 - 
-                Append(x.LPDCountAvg).Append(del).                       // 023 - 
-                Append(x.LPDCountMax).Append(del).                       // 024 - 
-                Append(x.LPDCM2Min).Append(del).                         // 025 - 
-                Append(x.LPDCountStdDev).Append(del).                    // 026 - 
-                Append(x.Employee).Append(del).                          // 027 - 
-                Append(x.RDS).Append(del).                               // 028 - Lot
-                Append(x.Reactor).Append(del).                           // 029 - Process
-                Append(x.Recipe.Replace(";", string.Empty)).Append(del). // 030 - Part
-                Append(x.ScratchCountAvg).Append(del).                   // 031 - Scratch Count
-                Append(x.ScratchCountMax).Append(del).                   // 032 - 
-                Append(x.ScratchCountMin).Append(del).                   // 033 - 
-                Append(x.ScratchTotalStdDev).Append(del).                // 034 - 
-                Append(x.ScratchTotalAvg).Append(del).                   // 035 - Scratch Length
-                Append(x.ScratchTotalMax).Append(del).                   // 036 - 
-                Append(x.ScratchTotalMin).Append(del).                   // 037 - 
-                Append(x.ScratchTotalStdDev).Append(del).                // 038 - 
-                Append(x.SumOfDefectsAvg).Append(del).                   // 039 - Average Sum of Defects
-                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 - 
-                AppendLine();
-        }
-        return result.ToString();
-    }
-
     private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List descriptions, Test[] tests)
     {
         bool isDummyRun = false;
@@ -258,47 +135,42 @@ public class FileRead : Shared.FileRead, IFileRead
         string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         if (descriptions.Count != 0 && tests.Length != 0)
         {
-            string lines = GetLines(_Logistics, descriptions);
-            if (!string.IsNullOrEmpty(lines))
+            _LastIndex += 1;
+            long? subgroupId;
+            if (_LastIndex >= _IQSCopyCollection.Count)
+                _LastIndex = 0;
+            long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
+            ModelObjectParameterDefinition modelObjectParameterDefinition = _IQSCopyCollection[_LastIndex];
+            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 wsResults))
             {
-                _LastIndex += 1;
-                long? subgroupId;
-                if (_LastIndex >= _IQSCopyCollection.Count)
-                    _LastIndex = 0;
-                long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
-                ModelObjectParameterDefinition modelObjectParameterDefinition = _IQSCopyCollection[_LastIndex];
-                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 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);
+            try
+            { FromIQS.SaveCopy(_FileConnectorConfiguration.SourceFileLocation, _IqsConnectionString, modelObjectParameterDefinition.Name, modelObjectParameterDefinition.Value.Split('|')); }
+            catch (Exception exception)
+            {
+                string subject = string.Concat("Exception:", _CellInstanceConnectionName);
+                string body = string.Concat(exception.Message, Environment.NewLine, Environment.NewLine, exception.StackTrace);
                 try
-                { FromIQS.SaveCopy(_FileConnectorConfiguration.SourceFileLocation, _IqsConnectionString, modelObjectParameterDefinition.Name, modelObjectParameterDefinition.Value.Split('|')); }
-                catch (Exception exception)
-                {
-                    string subject = string.Concat("Exception:", _CellInstanceConnectionName);
-                    string body = string.Concat(exception.Message, Environment.NewLine, Environment.NewLine, exception.StackTrace);
-                    try
-                    { _SMTP.SendHighPriorityEmailMessage(subject, body); }
-                    catch (Exception) { }
-                }
+                { _SMTP.SendHighPriorityEmailMessage(subject, body); }
+                catch (Exception) { }
             }
         }
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
+        {
+            File.Copy(reportFullPath, duplicateFile, overwrite: true);
             WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
+        }
     }
 
     private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime)
diff --git a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs b/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
index a8096e5..a0a0f3a 100644
--- a/Adaptation/FileHandlers/OpenInsight/FromIQS.cs
+++ b/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, pcl.Description description, string lines, long? subGroupId, string weekOfYear)
+    internal static void Save(string openInsightApiECDirectory, Logistics logistics, string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, pcl.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)
diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs
index 113ba5f..a86241d 100644
--- a/Adaptation/Shared/ProcessDataStandardFormat.cs
+++ b/Adaptation/Shared/ProcessDataStandardFormat.cs
@@ -462,6 +462,7 @@ internal class ProcessDataStandardFormat
             results.Add(string.Empty);
             List hyphens = new();
             results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => l.Replace('\t', '|')));
+            results.Add(string.Empty);
             results.Add($"|{string.Join("|", processDataStandardFormat.InputPDSF.Columns)}|");
             for (int i = 0; i < processDataStandardFormat.InputPDSF.Columns.Count; i++)
                 hyphens.Add('-');