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

Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs

@@ -268,7 +268,7 @@ public class FileRead : Shared.FileRead, IFileRead
         }
     }
 
-    private static ReadOnlyCollection<Pre> GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles, bool _)
+    private static ReadOnlyCollection<Pre> GetPreCollection(int numberLength, string parentDirectory, ReadOnlyCollection<string> matchingFiles)
     {
         List<Pre> 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);
+        ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles);
-        List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
-        bool mesEntityMatchesProcess = descriptions.Count > 0 && descriptions[0].MesEntity == descriptions[0].Reactor;
-        ReadOnlyCollection<Pre> preCollection = GetPreCollection(numberLength, parentParentDirectory, matchingFiles, mesEntityMatchesProcess);
         ReadOnlyCollection<PreWith> preWithCollection = GetPreWithCollection(preCollection);
         MoveCollection(dateTime, processDataStandardFormat, preWithCollection);
         return results;

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -6,11 +6,9 @@ using Adaptation.Shared.Methods;
 using Adaptation.Shared.Metrology;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 
 namespace Adaptation.FileHandlers.OpenInsight;
@@ -18,16 +16,12 @@ namespace Adaptation.FileHandlers.OpenInsight;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    private int _LastIndex;
     private readonly string _IqsConnectionString;
-    private readonly string _OpenInsightFilePattern;
     private readonly string _OpenInsightApiECDirectory;
-    private readonly ReadOnlyCollection<ModelObjectParameterDefinition> _IQSCopyCollection;
 
     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) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
-        _LastIndex = -1;
         _MinFileLength = 10;
         _Logistics = new(this);
         _NullData = string.Empty;
@@ -37,9 +31,7 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
-        _IQSCopyCollection = new(GetProperties(cellInstanceConnectionName, modelObjectParameters, "IQS.Copy."));
         _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
-        _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
         _OpenInsightApiECDirectory = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.Api.EC.Directory");
     }
 
@@ -118,76 +110,6 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    internal static string GetLines(Logistics logistics, List<pcl.Description> descriptions)
-    {
-        StringBuilder results = new();
-        char del = '\t';
-        pcl.Description x = descriptions[0];
-        _ = results.Append(x.UniqueId).Append(del).
-            Append(logistics.MesEntity).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.Wafer).Append(del).
-            Append(x.Lot).Append(del).
-            Append(x.Plan).Append(del).
-            Append(x.Date).Append(del).
-            Append(x.WaferSize).Append(del).
-            Append(x.Ccomp).Append(del).
-            Append(x.Area).Append(del).
-            Append(x.CondType).Append(del).
-            Append(x.Model).Append(del).
-            Append(x.StartVoltage).Append(del).
-            Append(x.StopVoltage).Append(del).
-            Append(x.RampRate).Append(del).
-            Append(x.GLimit.Replace(" µ", string.Empty)).Append(del).
-            Append(x.SetupFile).Append(del).
-            Append(x.SetupFile).Append(del).
-            Append(x.Folder).Append(del).
-            Append(x.Pattern).Append(del).
-            Append(x.RhoMethod).Append(del).
-            Append(x.NAvgMean).Append(del).
-            Append(x.NAvgStdDev).Append(del).
-            Append(x.NAvgRadialGradient).Append(del).
-            Append(x.NslMean).Append(del).
-            Append(x.NslStdDev).Append(del).
-            Append(x.NslRadialGradient).Append(del).
-            Append(x.VdMean).Append(del).
-            Append(x.VdStdDev).Append(del).
-            Append(x.VdRadialGradient).Append(del).
-            Append(x.FlatZMean).Append(del).
-            Append(x.FlatZStdDev).Append(del).
-            Append(x.FlatZRadialGradient).Append(del).
-            Append(x.RhoAvgMean).Append(del).
-            Append(x.RhoAvgStdDev).Append(del).
-            Append(x.RhoAvgRadialGradient).Append(del).
-            Append(x.RhoslMean).Append(del).
-            Append(x.RhoslStdDev).Append(del).
-            Append(x.RhoslRadialGradient).Append(del).
-            Append(x.PhaseMean).Append(del).
-            Append(x.PhaseStdDev).Append(del).
-            Append(x.PhaseRadialGradient).Append(del).
-            Append(x.GradeMean).Append(del).
-            Append(x.GradeStdDev).Append(del).
-            Append(x.GradeRadialGradient).Append(del).
-            Append(x.RsMean).Append(del).
-            Append(x.RsStdDev).Append(del).
-            Append(x.RsRadialGradient);
-        foreach (pcl.Description description in descriptions)
-            _ = results.Append(del).Append(description.Index + 1).
-                        Append(del).Append(description.NAvg).
-                        Append(del).Append(description.Nsl).
-                        Append(del).Append(description.Vd).
-                        Append(del).Append(description.FlatZ).
-                        Append(del).Append(description.RhoAvg).
-                        Append(del).Append(description.Rhosl).
-                        Append(del).Append(description.Phase).
-                        Append(del).Append(description.Grade);
-        return results.ToString();
-    }
-
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
@@ -205,6 +127,7 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<pcl.Description> descriptions, Test[] tests)
     {
+        string duplicateFile;
         bool isDummyRun = false;
         List<(Shared.Properties.IScopeInfo, string)> collection = new();
         string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
@@ -220,27 +143,18 @@ public class FileRead : Shared.FileRead, IFileRead
             if (!Directory.Exists(duplicateDirectory))
                 _ = Directory.CreateDirectory(duplicateDirectory);
         }
-        string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        if (descriptions.Count == 0 || tests.Length == 0)
-        if (descriptions.Count != 0 && tests.Length != 0)
+            duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
+        else
         {
-            string lines = GetLines(_Logistics, descriptions);
-            if (!string.IsNullOrEmpty(lines))
-            {
-                _LastIndex += 1;
             long? subgroupId;
-                if (_LastIndex >= _IQSCopyCollection.Count)
+            string fileName = Path.GetFileName(reportFullPath);
-                    _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<WS.Results> wsResults))
             {
                 if (wsResults is null || wsResults.Count != 1)
@@ -248,22 +162,18 @@ public class FileRead : Shared.FileRead, IFileRead
                 lock (_StaticRuns)
                     wsResults[0] = WS.Results.Get(wsResults[0], subgroupId);
             }
+            if (!fileName.StartsWith("Viewer"))
+                duplicateFile = Path.Combine(duplicateDirectory, $"{subgroupId} {fileName}".TrimStart());
+            else
+                duplicateFile = Path.Combine(duplicateDirectory, $"{$"Viewer {subgroupId}".TrimEnd()} {fileName.Replace("Viewer", string.Empty)}");
             string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
-                FromIQS.Save(_OpenInsightApiECDirectory, _Logistics, reportFullPath, processDataStandardFormat, descriptions.First(), lines, subgroupId, weekOfYear);
+            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
-                    { _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);
         }
+    }
 
 }

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,109 +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)
-    { // cSpell:disable
-        List<string> results = new();
-        if (iqsCopyValues.Length != 4)
-            throw new NotSupportedException();
-        string find = iqsCopyValues[1];
-        string replace = iqsCopyValues[3];
-        results.Add(" select pd.f_name [Part Name], ");
-        results.Add("        null [Part Revision], ");
-        results.Add($"       '{replace}' [Test Name], ");
-        results.Add("        null [Description], ");
-        results.Add("        null [Lot Number], ");
-        results.Add("        null [Job Name], ");
-        results.Add("        null [Process Name], ");
-        results.Add("        case when sl.f_url = 0 then null else sl.f_url end [Reasonable Limit (Upper)], ");
-        results.Add("        case when sl.f_url = 0 then 0 else 1 end [Alarm Reasonable Limit (Upper)], ");
-        results.Add("        case when sl.f_usl = 0 then null else sl.f_usl end [Specification Limit (Upper)], ");
-        results.Add("        case when sl.f_usl = 0 then 0 else 1 end [Alarm Specification Limit (Upper)], ");
-        results.Add("        case when sl.f_ugb = 0 then null else sl.f_ugb end [Warning Limit (Upper)], ");
-        results.Add("        case when sl.f_ugb = 0 then 0 else 1 end [Alarm Warning Limit (Upper)], ");
-        results.Add("        case when sl.f_tar = 0 then null else sl.f_tar end [Specification Limit (Target)], ");
-        results.Add("        case when sl.f_lgb = 0 then null else sl.f_lgb end [Warning Limit (Lower)], ");
-        results.Add("        case when sl.f_lgb = 0 then 0 else 1 end [Alarm Warning Limit (Lower)], ");
-        results.Add("        case when sl.f_lsl = 0 then null else sl.f_lsl end [Specification Limit (Lower)], ");
-        results.Add("        case when sl.f_lsl = 0 then 0 else 1 end [Alarm Specification Limit (Lower)], ");
-        results.Add("        case when sl.f_lrl = 0 then null else sl.f_lrl end [Reasonable Limit (Lower)], ");
-        results.Add("        case when sl.f_lrl = 0 then 0 else 1 end [Alarm Reasonable Limit (Lower)], ");
-        results.Add("        td.f_name [Original Test Name], ");
-        results.Add("        td.f_test [Test Id], ");
-        results.Add("        ( ");
-        results.Add("          select count(sl_b.f_spec) ");
-        results.Add("          from [spcepiworld].[dbo].[spec_lim] sl_b ");
-        results.Add("          join [spcepiworld].[dbo].[part_dat] pd_b ");
-        results.Add("          on sl_b.f_part = pd_b.f_part ");
-        results.Add("          join [spcepiworld].[dbo].[test_dat] td_b ");
-        results.Add("          on sl_b.f_test = td_b.f_test ");
-        results.Add("          where sl_b.f_prcs = 0 ");
-        results.Add($"         and td_b.f_name = '{replace}' ");
-        results.Add("          and pd_b.f_name = pd.f_name ");
-        results.Add("          and sl_b.f_url = sl.f_url ");
-        results.Add("          and sl_b.f_usl = sl.f_usl ");
-        results.Add("          and sl_b.f_ugb = sl.f_ugb ");
-        results.Add("          and sl_b.f_tar = sl.f_tar ");
-        results.Add("          and sl_b.f_lgb = sl.f_lgb ");
-        results.Add("          and sl_b.f_lsl = sl.f_lsl ");
-        results.Add("          and sl_b.f_lrl = sl.f_lrl ");
-        results.Add("          group by sl_b.f_spec ");
-        results.Add("        ) count ");
-        results.Add(" from [spcepiworld].[dbo].[spec_lim] sl ");
-        results.Add(" join [spcepiworld].[dbo].[part_dat] pd ");
-        results.Add("   on sl.f_part = pd.f_part ");
-        results.Add(" join [spcepiworld].[dbo].[test_dat] td ");
-        results.Add("   on sl.f_test = td.f_test ");
-        results.Add(" where sl.f_prcs = 0 ");
-        results.Add($"   and td.f_name = '{find}' ");
-        results.Add("   and isnull(( ");
-        results.Add("        select count(sl_b.f_spec) ");
-        results.Add("        from [spcepiworld].[dbo].[spec_lim] sl_b ");
-        results.Add("        join [spcepiworld].[dbo].[part_dat] pd_b ");
-        results.Add("        on sl_b.f_part = pd_b.f_part ");
-        results.Add("        join [spcepiworld].[dbo].[test_dat] td_b ");
-        results.Add("        on sl_b.f_test = td_b.f_test ");
-        results.Add("        where sl_b.f_prcs = 0 ");
-        results.Add($"       and td_b.f_name = '{replace}' ");
-        results.Add("        and pd_b.f_name = pd.f_name ");
-        results.Add("        and sl_b.f_url = sl.f_url ");
-        results.Add("        and sl_b.f_usl = sl.f_usl ");
-        results.Add("        and sl_b.f_ugb = sl.f_ugb ");
-        results.Add("        and sl_b.f_tar = sl.f_tar ");
-        results.Add("        and sl_b.f_lgb = sl.f_lgb ");
-        results.Add("        and sl_b.f_lsl = sl.f_lsl ");
-        results.Add("        and sl_b.f_lrl = sl.f_lrl ");
-        results.Add("        group by sl_b.f_spec ");
-        results.Add("   ), 0) = 0 ");
-        results.Add(" for json path ");
-        return string.Join(Environment.NewLine, results);
-    } // cSpell:restore
-
-    internal static void SaveCopy(string fileConnectorConfigurationSourceFileLocation, string connectionString, string name, string[] iqsCopyValues)
-    {
-        string checkFile = Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.json");
-        if (!File.Exists(checkFile))
-        {
-            string commandText = GetCommandText(iqsCopyValues);
-            StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText);
-            if (stringBuilder.Length != 0)
-                File.WriteAllText(checkFile, stringBuilder.ToString());
-            else
-                File.WriteAllText(Path.Combine(fileConnectorConfigurationSourceFileLocation, $"{name}.sql"), commandText);
-        }
-    }
-
-#nullable disable
-
 }