Compare commits
	
		
			4 Commits
		
	
	
		
			09-24-a
			...
			468890e5f4
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 468890e5f4 | |||
| b1696afd26 | |||
| b0b5033314 | |||
| 21aaf804ee | 
| @ -38,9 +38,27 @@ stages: | |||||||
|             displayName: "Echo Check" |             displayName: "Echo Check" | ||||||
|  |  | ||||||
|           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear' |           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear' | ||||||
|             displayName: "Nuget Clear" |             displayName: "Nuget Nuget Clear" | ||||||
|             enabled: false |             enabled: false | ||||||
|  |  | ||||||
|  |           - task: CopyFiles@2 | ||||||
|  |             displayName: 'Copy GhostPCL Files to: D:\EAF-Mesa-Integration\copy' | ||||||
|  |             inputs: | ||||||
|  |               Contents: "*" | ||||||
|  |               SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL' | ||||||
|  |               TargetFolder: 'D:\EAF-Mesa-Integration\copy\GhostPCL' | ||||||
|  |               OverWrite: true | ||||||
|  |             enabled: true | ||||||
|  |  | ||||||
|  |           - task: CopyFiles@2 | ||||||
|  |             displayName: 'Copy LincPDFC Files to: D:\EAF-Mesa-Integration\copy' | ||||||
|  |             inputs: | ||||||
|  |               Contents: "*" | ||||||
|  |               SourceFolder: '\\mesfs.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC' | ||||||
|  |               TargetFolder: 'D:\EAF-Mesa-Integration\copy\LincPDFC' | ||||||
|  |               OverWrite: true | ||||||
|  |             enabled: true | ||||||
|  |  | ||||||
|           - script: | |           - script: | | ||||||
|               "C:\program files\dotnet\dotnet.exe" user-secrets init |               "C:\program files\dotnet\dotnet.exe" user-secrets init | ||||||
|               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)" |               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)" | ||||||
| @ -181,9 +199,27 @@ stages: | |||||||
|             displayName: "Echo Check" |             displayName: "Echo Check" | ||||||
|  |  | ||||||
|           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear' |           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear' | ||||||
|             displayName: "Nuget Clear" |             displayName: "Nuget Nuget Clear" | ||||||
|             enabled: false |             enabled: false | ||||||
|  |  | ||||||
|  |           - task: CopyFiles@2 | ||||||
|  |             displayName: 'Copy GhostPCL Files to: D:\EAF-Mesa-Integration\copy' | ||||||
|  |             inputs: | ||||||
|  |               Contents: "*" | ||||||
|  |               SourceFolder: '\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\GhostPCL' | ||||||
|  |               TargetFolder: 'D:\EAF-Mesa-Integration\copy\GhostPCL' | ||||||
|  |               OverWrite: true | ||||||
|  |             enabled: true | ||||||
|  |  | ||||||
|  |           - task: CopyFiles@2 | ||||||
|  |             displayName: 'Copy LincPDFC Files to: D:\EAF-Mesa-Integration\copy' | ||||||
|  |             inputs: | ||||||
|  |               Contents: "*" | ||||||
|  |               SourceFolder: '\\mestsa003.infineon.com\EC_EAFRepository\Staging\DeploymentStorage\LincPDFC' | ||||||
|  |               TargetFolder: 'D:\EAF-Mesa-Integration\copy\LincPDFC' | ||||||
|  |               OverWrite: true | ||||||
|  |             enabled: true | ||||||
|  |  | ||||||
|           - script: | |           - script: | | ||||||
|               "C:\program files\dotnet\dotnet.exe" user-secrets init |               "C:\program files\dotnet\dotnet.exe" user-secrets init | ||||||
|               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)" |               "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)" | ||||||
|  | |||||||
| @ -13,7 +13,9 @@ public class CellInstanceConnectionName | |||||||
|     { |     { | ||||||
|         IFileRead result = cellInstanceConnectionName switch |         IFileRead result = cellInstanceConnectionName switch | ||||||
|         { |         { | ||||||
|  |             nameof(R29) => new R29.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|             nameof(R32) => new R32.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), |             nameof(R32) => new R32.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|  |             nameof(R36) => new R36.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|             nameof(R55) => new R55.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), |             nameof(R55) => new R55.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|             nameof(R57) => new R57.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), |             nameof(R57) => new R57.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|             nameof(R61) => new R61.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), |             nameof(R61) => new R61.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), | ||||||
|  | |||||||
							
								
								
									
										238
									
								
								Adaptation/FileHandlers/R29/FileRead.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										238
									
								
								Adaptation/FileHandlers/R29/FileRead.cs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,238 @@ | |||||||
|  | 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.Collections.ObjectModel; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.IO; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text.Json; | ||||||
|  |  | ||||||
|  | namespace Adaptation.FileHandlers.R29; | ||||||
|  |  | ||||||
|  | public class FileRead : Shared.FileRead, IFileRead | ||||||
|  | { | ||||||
|  |  | ||||||
|  |     private readonly string _KeyColumn; | ||||||
|  |     private readonly string _TimestampFormat; | ||||||
|  |     private readonly ReadOnlyDictionary<string, string> _SystemStateToNames; | ||||||
|  |  | ||||||
|  |     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<Shared.Metrology.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) | ||||||
|  |     { | ||||||
|  |         _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); | ||||||
|  |         string[] segments; | ||||||
|  |         Dictionary<string, string> systemStateToNames = new(); | ||||||
|  |         _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.KeyColumn"); | ||||||
|  |         _TimestampFormat = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.TimestampFormat"); | ||||||
|  |         ModelObjectParameterDefinition[] systemStates = GetProperties(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState"); | ||||||
|  |         foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in systemStates) | ||||||
|  |         { | ||||||
|  |             segments = modelObjectParameterDefinition.Value.Split('|'); | ||||||
|  |             if (segments.Length != 2) | ||||||
|  |                 continue; | ||||||
|  |             systemStateToNames.Add(segments[0], segments[1]); | ||||||
|  |         } | ||||||
|  |         _SystemStateToNames = new(systemStateToNames); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     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 static int? GetKeyColumnIndex(string[] columns, string keyColumn) | ||||||
|  |     { | ||||||
|  | #nullable enable | ||||||
|  |         int? result = null; | ||||||
|  |         for (int i = 0; i < columns.Length; i++) | ||||||
|  |         { | ||||||
|  |             if (columns[i] != keyColumn) | ||||||
|  |                 continue; | ||||||
|  |             result = i; | ||||||
|  |             break; | ||||||
|  |         } | ||||||
|  |         return result; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private ReadOnlyCollection<string> GetSystemStateValues(List<string> lines, string[] columns, int keyColumnIndex) | ||||||
|  |     { | ||||||
|  |         List<string> results = new(); | ||||||
|  |         string[] values; | ||||||
|  |         string? systemState; | ||||||
|  |         string keyColumnValue; | ||||||
|  |         for (int i = 7; i < lines.Count; i++) | ||||||
|  |         { | ||||||
|  |             values = lines[i].Split('\t'); | ||||||
|  |             if (values.Length != columns.Length) | ||||||
|  |                 continue; | ||||||
|  |             keyColumnValue = values[keyColumnIndex]; | ||||||
|  |             if (string.IsNullOrEmpty(keyColumnValue)) | ||||||
|  |                 continue; | ||||||
|  |             if (!_SystemStateToNames.TryGetValue(keyColumnValue, out systemState)) | ||||||
|  |                 continue; | ||||||
|  |             if (results.Contains(systemState)) | ||||||
|  |                 continue; | ||||||
|  |             results.Add(systemState); | ||||||
|  |         } | ||||||
|  |         return new(results); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private void CopyFile(string reportFullPath) | ||||||
|  |     { | ||||||
|  |         string equipment; | ||||||
|  |         string timestamp; | ||||||
|  |         string[] columns; | ||||||
|  |         DateTime dateTime; | ||||||
|  |         List<string> lines; | ||||||
|  |         string systemState; | ||||||
|  |         int? keyColumnIndex; | ||||||
|  |         string checkFileName; | ||||||
|  |         List<string> headerLines = new(); | ||||||
|  |         ReadOnlyCollection<string> systemStateValues; | ||||||
|  |         string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, "Missing-Key"); | ||||||
|  |         if (!Directory.Exists(missingKeyDirectory)) | ||||||
|  |             _ = Directory.CreateDirectory(missingKeyDirectory); | ||||||
|  |         string fileName = Path.GetFileName(reportFullPath); | ||||||
|  |         string[] segments = fileName.Split('_'); | ||||||
|  |         for (int z = 0; z < 1; z++) | ||||||
|  |         { | ||||||
|  |             if (segments.Length != 2) | ||||||
|  |                 continue; | ||||||
|  |             equipment = segments[0]; | ||||||
|  |             timestamp = segments[1].Split('.')[0]; | ||||||
|  |             if (timestamp.Length != _TimestampFormat.Length) | ||||||
|  |                 continue; | ||||||
|  |             headerLines.Clear(); | ||||||
|  |             lines = File.ReadAllLines(reportFullPath).ToList(); | ||||||
|  |             if (lines.Count < 8) | ||||||
|  |                 continue; | ||||||
|  |             for (int i = 0; i < 6; i++) | ||||||
|  |             { | ||||||
|  |                 headerLines.Add(lines[0]); | ||||||
|  |                 lines.RemoveAt(0); | ||||||
|  |             } | ||||||
|  |             if (lines[0].Length < 1 || lines[0][0] != '"' || !lines[0].StartsWith("\"Time\"")) | ||||||
|  |                 continue; | ||||||
|  |             columns = lines[0].Split('\t'); | ||||||
|  |             if (columns.Length < 3) | ||||||
|  |                 continue; | ||||||
|  |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|  |             if (keyColumnIndex is null) | ||||||
|  |             { | ||||||
|  |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|  |                 continue; | ||||||
|  |             } | ||||||
|  |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|  |             if (systemStateValues.Count == 0) | ||||||
|  |             { | ||||||
|  |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|  |                 continue; | ||||||
|  |             } | ||||||
|  |             lines.AddRange(headerLines); | ||||||
|  |             systemState = string.Join("-", systemStateValues); | ||||||
|  |             checkFileName = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, $"{equipment}-{timestamp}-{systemState}.pdsf"); | ||||||
|  |             File.WriteAllLines(checkFileName, lines); | ||||||
|  |             // File.Delete(reportFullPath); | ||||||
|  |             if (DateTime.TryParseExact(timestamp, _TimestampFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime)) | ||||||
|  |                 File.SetLastWriteTime(checkFileName, dateTime); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime _) | ||||||
|  |     { | ||||||
|  |         Tuple<string, Test[], JsonElement[], List<FileInfo>> results; | ||||||
|  |         ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath); | ||||||
|  |         _Logistics = new Logistics(reportFullPath, processDataStandardFormat); | ||||||
|  |         SetFileParameterLotIDToLogisticsMID(); | ||||||
|  |         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat); | ||||||
|  |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|  |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|  |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|  |             CopyFile(reportFullPath); | ||||||
|  |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|  |         return results; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  | } | ||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
							
								
								
									
										238
									
								
								Adaptation/FileHandlers/R36/FileRead.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										238
									
								
								Adaptation/FileHandlers/R36/FileRead.cs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,238 @@ | |||||||
|  | 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.Collections.ObjectModel; | ||||||
|  | using System.Globalization; | ||||||
|  | using System.IO; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text.Json; | ||||||
|  |  | ||||||
|  | namespace Adaptation.FileHandlers.R36; | ||||||
|  |  | ||||||
|  | public class FileRead : Shared.FileRead, IFileRead | ||||||
|  | { | ||||||
|  |  | ||||||
|  |     private readonly string _KeyColumn; | ||||||
|  |     private readonly string _TimestampFormat; | ||||||
|  |     private readonly ReadOnlyDictionary<string, string> _SystemStateToNames; | ||||||
|  |  | ||||||
|  |     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<Shared.Metrology.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) | ||||||
|  |     { | ||||||
|  |         _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); | ||||||
|  |         string[] segments; | ||||||
|  |         Dictionary<string, string> systemStateToNames = new(); | ||||||
|  |         _KeyColumn = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.KeyColumn"); | ||||||
|  |         _TimestampFormat = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.TimestampFormat"); | ||||||
|  |         ModelObjectParameterDefinition[] systemStates = GetProperties(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState"); | ||||||
|  |         foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in systemStates) | ||||||
|  |         { | ||||||
|  |             segments = modelObjectParameterDefinition.Value.Split('|'); | ||||||
|  |             if (segments.Length != 2) | ||||||
|  |                 continue; | ||||||
|  |             systemStateToNames.Add(segments[0], segments[1]); | ||||||
|  |         } | ||||||
|  |         _SystemStateToNames = new(systemStateToNames); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     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 static int? GetKeyColumnIndex(string[] columns, string keyColumn) | ||||||
|  |     { | ||||||
|  | #nullable enable | ||||||
|  |         int? result = null; | ||||||
|  |         for (int i = 0; i < columns.Length; i++) | ||||||
|  |         { | ||||||
|  |             if (columns[i] != keyColumn) | ||||||
|  |                 continue; | ||||||
|  |             result = i; | ||||||
|  |             break; | ||||||
|  |         } | ||||||
|  |         return result; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private ReadOnlyCollection<string> GetSystemStateValues(List<string> lines, string[] columns, int keyColumnIndex) | ||||||
|  |     { | ||||||
|  |         List<string> results = new(); | ||||||
|  |         string[] values; | ||||||
|  |         string? systemState; | ||||||
|  |         string keyColumnValue; | ||||||
|  |         for (int i = 7; i < lines.Count; i++) | ||||||
|  |         { | ||||||
|  |             values = lines[i].Split('\t'); | ||||||
|  |             if (values.Length != columns.Length) | ||||||
|  |                 continue; | ||||||
|  |             keyColumnValue = values[keyColumnIndex]; | ||||||
|  |             if (string.IsNullOrEmpty(keyColumnValue)) | ||||||
|  |                 continue; | ||||||
|  |             if (!_SystemStateToNames.TryGetValue(keyColumnValue, out systemState)) | ||||||
|  |                 continue; | ||||||
|  |             if (results.Contains(systemState)) | ||||||
|  |                 continue; | ||||||
|  |             results.Add(systemState); | ||||||
|  |         } | ||||||
|  |         return new(results); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private void CopyFile(string reportFullPath) | ||||||
|  |     { | ||||||
|  |         string equipment; | ||||||
|  |         string timestamp; | ||||||
|  |         string[] columns; | ||||||
|  |         DateTime dateTime; | ||||||
|  |         List<string> lines; | ||||||
|  |         string systemState; | ||||||
|  |         int? keyColumnIndex; | ||||||
|  |         string checkFileName; | ||||||
|  |         List<string> headerLines = new(); | ||||||
|  |         ReadOnlyCollection<string> systemStateValues; | ||||||
|  |         string missingKeyDirectory = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, "Missing-Key"); | ||||||
|  |         if (!Directory.Exists(missingKeyDirectory)) | ||||||
|  |             _ = Directory.CreateDirectory(missingKeyDirectory); | ||||||
|  |         string fileName = Path.GetFileName(reportFullPath); | ||||||
|  |         string[] segments = fileName.Split('_'); | ||||||
|  |         for (int z = 0; z < 1; z++) | ||||||
|  |         { | ||||||
|  |             if (segments.Length != 2) | ||||||
|  |                 continue; | ||||||
|  |             equipment = segments[0]; | ||||||
|  |             timestamp = segments[1].Split('.')[0]; | ||||||
|  |             if (timestamp.Length != _TimestampFormat.Length) | ||||||
|  |                 continue; | ||||||
|  |             headerLines.Clear(); | ||||||
|  |             lines = File.ReadAllLines(reportFullPath).ToList(); | ||||||
|  |             if (lines.Count < 8) | ||||||
|  |                 continue; | ||||||
|  |             for (int i = 0; i < 6; i++) | ||||||
|  |             { | ||||||
|  |                 headerLines.Add(lines[0]); | ||||||
|  |                 lines.RemoveAt(0); | ||||||
|  |             } | ||||||
|  |             if (lines[0].Length < 1 || lines[0][0] != '"' || !lines[0].StartsWith("\"Time\"")) | ||||||
|  |                 continue; | ||||||
|  |             columns = lines[0].Split('\t'); | ||||||
|  |             if (columns.Length < 3) | ||||||
|  |                 continue; | ||||||
|  |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|  |             if (keyColumnIndex is null) | ||||||
|  |             { | ||||||
|  |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|  |                 continue; | ||||||
|  |             } | ||||||
|  |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|  |             if (systemStateValues.Count == 0) | ||||||
|  |             { | ||||||
|  |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|  |                 continue; | ||||||
|  |             } | ||||||
|  |             lines.AddRange(headerLines); | ||||||
|  |             systemState = string.Join("-", systemStateValues); | ||||||
|  |             checkFileName = Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, $"{equipment}-{timestamp}-{systemState}.pdsf"); | ||||||
|  |             File.WriteAllLines(checkFileName, lines); | ||||||
|  |             // File.Delete(reportFullPath); | ||||||
|  |             if (DateTime.TryParseExact(timestamp, _TimestampFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime)) | ||||||
|  |                 File.SetLastWriteTime(checkFileName, dateTime); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime _) | ||||||
|  |     { | ||||||
|  |         Tuple<string, Test[], JsonElement[], List<FileInfo>> results; | ||||||
|  |         ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath); | ||||||
|  |         _Logistics = new Logistics(reportFullPath, processDataStandardFormat); | ||||||
|  |         SetFileParameterLotIDToLogisticsMID(); | ||||||
|  |         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat); | ||||||
|  |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|  |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|  |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|  |             CopyFile(reportFullPath); | ||||||
|  |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|  |         return results; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  | } | ||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -159,7 +159,7 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         return new(results); |         return new(results); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void MoveFile(string reportFullPath) |     private void CopyFile(string reportFullPath) | ||||||
|     { |     { | ||||||
|         string equipment; |         string equipment; | ||||||
|         string timestamp; |         string timestamp; | ||||||
| @ -201,13 +201,13 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); |             keyColumnIndex = GetKeyColumnIndex(columns, _KeyColumn); | ||||||
|             if (keyColumnIndex is null) |             if (keyColumnIndex is null) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); |             systemStateValues = GetSystemStateValues(lines, columns, keyColumnIndex.Value); | ||||||
|             if (systemStateValues.Count == 0) |             if (systemStateValues.Count == 0) | ||||||
|             { |             { | ||||||
|                 File.Move(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); |                 File.Copy(reportFullPath, Path.Combine(_FileConnectorConfiguration.AlternateTargetFolder, missingKeyDirectory, fileName)); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             lines.AddRange(headerLines); |             lines.AddRange(headerLines); | ||||||
| @ -230,8 +230,8 @@ public class FileRead : Shared.FileRead, IFileRead | |||||||
|         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); |         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements); | ||||||
|         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); |         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); | ||||||
|         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) |         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) | ||||||
|             MoveFile(reportFullPath); |             CopyFile(reportFullPath); | ||||||
|         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>()); |         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>()); | ||||||
|         return results; |         return results; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | |||||||
| @ -478,27 +478,14 @@ public class FileRead : Properties.IFileRead | |||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements) |     protected static void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements) | ||||||
|     { |     { | ||||||
|         string directory; | #pragma warning disable CA1510 | ||||||
|         string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; |         if (fileRead is null) | ||||||
|         string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); |             throw new ArgumentNullException(nameof(fileRead)); | ||||||
|         string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}"; |         if (jsonElements is null) | ||||||
|         if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType) |             throw new ArgumentNullException(nameof(jsonElements)); | ||||||
|             directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName); | #pragma warning restore CA1510 | ||||||
|         else |  | ||||||
|             directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName); |  | ||||||
|         if (!Directory.Exists(directory)) |  | ||||||
|             _ = Directory.CreateDirectory(directory); |  | ||||||
|         string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf")); |  | ||||||
|         string lines = ProcessDataStandardFormat.GetPDSFText(fileRead, _Logistics, jsonElements, logisticsText: string.Empty); |  | ||||||
|         File.WriteAllText(file, lines); |  | ||||||
|         if (_Logistics.TotalSecondsSinceLastWriteTimeFromSequence > 600) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { File.SetLastWriteTime(file, _Logistics.DateTimeFromSequence); } |  | ||||||
|             catch (Exception) { } |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     protected void WaitForThread(Thread thread, List<Exception> threadExceptions) |     protected void WaitForThread(Thread thread, List<Exception> threadExceptions) | ||||||
|  | |||||||
| @ -136,6 +136,7 @@ internal class ProcessDataStandardFormat | |||||||
|     internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, string[]? lines = null, int columnsLine = 6) |     internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, string[]? lines = null, int columnsLine = 6) | ||||||
|     { |     { | ||||||
|         ProcessDataStandardFormat result; |         ProcessDataStandardFormat result; | ||||||
|  |         long? sequence; | ||||||
|         string segment; |         string segment; | ||||||
|         string[] segments; |         string[] segments; | ||||||
|         bool addToFooter = false; |         bool addToFooter = false; | ||||||
| @ -186,13 +187,25 @@ internal class ProcessDataStandardFormat | |||||||
|         } |         } | ||||||
|         string? linesOne = lines.Length > 0 && body.Count == 0 && columns.Count == 0 ? lines[1] : null; |         string? linesOne = lines.Length > 0 && body.Count == 0 && columns.Count == 0 ? lines[1] : null; | ||||||
|         logistics = GetLogistics(footer, linesOne: linesOne); |         logistics = GetLogistics(footer, linesOne: linesOne); | ||||||
|  |         if (logistics.Count == 0) | ||||||
|  |             sequence = null; | ||||||
|  |         else | ||||||
|  |         { | ||||||
|  |             segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None); | ||||||
|  |             sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s; | ||||||
|  |         } | ||||||
|  |         if (sequence is null && !string.IsNullOrEmpty(reportFullPath)) | ||||||
|  |         { | ||||||
|  |             FileInfo fileInfo = new(reportFullPath); | ||||||
|  |             sequence = fileInfo.LastWriteTime.Ticks; | ||||||
|  |         } | ||||||
|         result = new(body: body.AsReadOnly(), |         result = new(body: body.AsReadOnly(), | ||||||
|                      columns: columns.AsReadOnly(), |                      columns: columns.AsReadOnly(), | ||||||
|                      footer: footer.AsReadOnly(), |                      footer: footer.AsReadOnly(), | ||||||
|                      header: header.AsReadOnly(), |                      header: header.AsReadOnly(), | ||||||
|                      inputPDSF: null, |                      inputPDSF: null, | ||||||
|                      logistics: logistics, |                      logistics: logistics, | ||||||
|                      sequence: null); |                      sequence: sequence); | ||||||
|         return result; |         return result; | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @ -236,7 +249,7 @@ internal class ProcessDataStandardFormat | |||||||
|     private static ProcessDataStandardFormat GetProcessDataStandardFormat(DateTime lastWriteTime, int columnsLine, string path, string[]? lines) |     private static ProcessDataStandardFormat GetProcessDataStandardFormat(DateTime lastWriteTime, int columnsLine, string path, string[]? lines) | ||||||
|     { |     { | ||||||
|         ProcessDataStandardFormat result; |         ProcessDataStandardFormat result; | ||||||
|         long sequence; |         long? sequence; | ||||||
|         string[] segments; |         string[] segments; | ||||||
|         bool addToFooter = false; |         bool addToFooter = false; | ||||||
|         List<string> body = new(); |         List<string> body = new(); | ||||||
| @ -268,12 +281,13 @@ internal class ProcessDataStandardFormat | |||||||
|         } |         } | ||||||
|         logistics = GetLogistics(footer, linesOne: null); |         logistics = GetLogistics(footer, linesOne: null); | ||||||
|         if (logistics.Count == 0) |         if (logistics.Count == 0) | ||||||
|             sequence = lastWriteTime.Ticks; |             sequence = null; | ||||||
|         else |         else | ||||||
|         { |         { | ||||||
|             segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None); |             segments = logistics[0].Split(new string[] { "SEQUENCE=" }, StringSplitOptions.None); | ||||||
|             sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? lastWriteTime.Ticks : s; |             sequence = segments.Length < 2 || !long.TryParse(segments[1].Split(';')[0], out long s) ? null : s; | ||||||
|         } |         } | ||||||
|  |         sequence ??= lastWriteTime.Ticks; | ||||||
|         result = new(body: body.AsReadOnly(), |         result = new(body: body.AsReadOnly(), | ||||||
|                      columns: new(columns), |                      columns: new(columns), | ||||||
|                      footer: footer.AsReadOnly(), |                      footer: footer.AsReadOnly(), | ||||||
| @ -302,7 +316,7 @@ internal class ProcessDataStandardFormat | |||||||
|                 segments = bodyLine.Split('\t').ToList(); |                 segments = bodyLine.Split('\t').ToList(); | ||||||
|                 for (int c = 0; c < segments.Count; c++) |                 for (int c = 0; c < segments.Count; c++) | ||||||
|                 { |                 { | ||||||
|                     value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\"); |                     value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\""); | ||||||
|                     _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\","); |                     _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\","); | ||||||
|                 } |                 } | ||||||
|                 _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); |                 _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); | ||||||
| @ -378,7 +392,7 @@ internal class ProcessDataStandardFormat | |||||||
|                 break; |                 break; | ||||||
|             for (int c = 0; c < segments.Length; c++) |             for (int c = 0; c < segments.Length; c++) | ||||||
|             { |             { | ||||||
|                 value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\"); |                 value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\""); | ||||||
|                 line += string.Concat('"', processDataStandardFormat.InputPDSF.Columns[c].Trim('"'), '"', ':', '"', value, '"', ','); |                 line += string.Concat('"', processDataStandardFormat.InputPDSF.Columns[c].Trim('"'), '"', ':', '"', value, '"', ','); | ||||||
|             } |             } | ||||||
|             line = string.Concat(line.Substring(0, line.Length - 1), '}'); |             line = string.Concat(line.Substring(0, line.Length - 1), '}'); | ||||||
| @ -517,7 +531,7 @@ internal class ProcessDataStandardFormat | |||||||
|                 { |                 { | ||||||
|                     for (int c = 1; c < segments.Length; c++) |                     for (int c = 1; c < segments.Length; c++) | ||||||
|                     { |                     { | ||||||
|                         value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\"); |                         value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\""); | ||||||
|                         _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\","); |                         _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":\"").Append(value).Append("\","); | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
| @ -525,7 +539,7 @@ internal class ProcessDataStandardFormat | |||||||
|                 { |                 { | ||||||
|                     for (int c = 1; c < segments.Length; c++) |                     for (int c = 1; c < segments.Length; c++) | ||||||
|                     { |                     { | ||||||
|                         value = segments[c].Replace("\"", "\\\"").Replace("\\", "\\\\"); |                         value = segments[c].Replace("\\", "\\\\").Replace("\"", "\\\""); | ||||||
|                         if (string.IsNullOrEmpty(value)) |                         if (string.IsNullOrEmpty(value)) | ||||||
|                             _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":").Append(value).Append("null,"); |                             _ = stringBuilder.Append('"').Append(processDataStandardFormat.Columns[c]).Append("\":").Append(value).Append("null,"); | ||||||
|                         else if (value.All(char.IsDigit)) |                         else if (value.All(char.IsDigit)) | ||||||
|  | |||||||
| @ -52,7 +52,7 @@ public class DEP08CEPIEPSILON : EAFLoggingUnitTesting | |||||||
|     [TestMethod] |     [TestMethod] | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R32() |     public void Production__v2_60_0__DEP08CEPIEPSILON__R32() | ||||||
|     { |     { | ||||||
|         string check = "T27*.pdsf"; |         string check = "R32*.pdsf"; | ||||||
|         MethodBase methodBase = new StackFrame().GetMethod(); |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
| @ -63,7 +63,73 @@ public class DEP08CEPIEPSILON : EAFLoggingUnitTesting | |||||||
|     [TestMethod] |     [TestMethod] | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R62() |     public void Production__v2_60_0__DEP08CEPIEPSILON__R62() | ||||||
|     { |     { | ||||||
|         string check = "T41*.pdsf"; |         string check = "R62*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R75() | ||||||
|  |     { | ||||||
|  |         string check = "R75*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R77() | ||||||
|  |     { | ||||||
|  |         string check = "R77*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R61() | ||||||
|  |     { | ||||||
|  |         string check = "R61*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R65() | ||||||
|  |     { | ||||||
|  |         string check = "R65*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R29() | ||||||
|  |     { | ||||||
|  |         string check = "R29*.pdsf"; | ||||||
|  |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|  |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     [Ignore] | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R55() | ||||||
|  |     { | ||||||
|  |         string check = "R55*.pdsf"; | ||||||
|         MethodBase methodBase = new StackFrame().GetMethod(); |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); |         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); | ||||||
|         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); |         _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); | ||||||
|  | |||||||
| @ -32,35 +32,57 @@ public class DEP08CEPIEPSILON | |||||||
|         catch (Exception) { } |         catch (Exception) { } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|     [Ignore] |     [Ignore] | ||||||
|  | #endif | ||||||
|     [TestMethod] |     [TestMethod] | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R32() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R32(); |     public void Production__v2_60_0__DEP08CEPIEPSILON__R32() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R32(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|     [Ignore] |     [Ignore] | ||||||
|     [TestMethod] | #endif | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R32638594189939758135__First() |  | ||||||
|     { |  | ||||||
|         string check = "T27*.pdsf"; |  | ||||||
|         MethodBase methodBase = new StackFrame().GetMethod(); |  | ||||||
|         _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R32(); |  | ||||||
|         string[] variables = _DEP08CEPIEPSILON.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); |  | ||||||
|         IFileRead fileRead = _DEP08CEPIEPSILON.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); |  | ||||||
|         Logistics logistics = new(fileRead); |  | ||||||
|         _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); |  | ||||||
|         NonThrowTryCatch(); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     [Ignore] |  | ||||||
|     [TestMethod] |     [TestMethod] | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R62() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R62(); |     public void Production__v2_60_0__DEP08CEPIEPSILON__R62() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R62(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|     [Ignore] |     [Ignore] | ||||||
|  | #endif | ||||||
|     [TestMethod] |     [TestMethod] | ||||||
|     public void Production__v2_60_0__DEP08CEPIEPSILON__R62638594189939758135__First() |     public void Production__v2_60_0__DEP08CEPIEPSILON__R75() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R75(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R77() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R77(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R61() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R61(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R65() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R65(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R29() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R29(); | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R29638856695638795511__First() | ||||||
|     { |     { | ||||||
|         string check = "T41*.pdsf"; |         string check = "R29*.pdsf"; | ||||||
|         MethodBase methodBase = new StackFrame().GetMethod(); |         MethodBase methodBase = new StackFrame().GetMethod(); | ||||||
|         _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R62(); |         _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R29(); | ||||||
|         string[] variables = _DEP08CEPIEPSILON.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); |         string[] variables = _DEP08CEPIEPSILON.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false); | ||||||
|         IFileRead fileRead = _DEP08CEPIEPSILON.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); |         IFileRead fileRead = _DEP08CEPIEPSILON.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); | ||||||
|         Logistics logistics = new(fileRead); |         Logistics logistics = new(fileRead); | ||||||
| @ -68,5 +90,11 @@ public class DEP08CEPIEPSILON | |||||||
|         NonThrowTryCatch(); |         NonThrowTryCatch(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | #if DEBUG | ||||||
|  |     [Ignore] | ||||||
|  | #endif | ||||||
|  |     [TestMethod] | ||||||
|  |     public void Production__v2_60_0__DEP08CEPIEPSILON__R55() => _DEP08CEPIEPSILON.Production__v2_60_0__DEP08CEPIEPSILON__R55(); | ||||||
|  |  | ||||||
| } | } | ||||||
| #endif | #endif | ||||||
| @ -105,7 +105,9 @@ | |||||||
|     <Compile Include="Adaptation\Eaf\Management\ConfigurationData\Semiconductor\CellInstances\SecsConnectionConfiguration.cs" /> |     <Compile Include="Adaptation\Eaf\Management\ConfigurationData\Semiconductor\CellInstances\SecsConnectionConfiguration.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\CellInstanceConnectionName.cs" /> |     <Compile Include="Adaptation\FileHandlers\CellInstanceConnectionName.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\Dummy\FileRead.cs" /> |     <Compile Include="Adaptation\FileHandlers\Dummy\FileRead.cs" /> | ||||||
|  |     <Compile Include="Adaptation\FileHandlers\R29\FileRead.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\R32\FileRead.cs" /> |     <Compile Include="Adaptation\FileHandlers\R32\FileRead.cs" /> | ||||||
|  |     <Compile Include="Adaptation\FileHandlers\R36\FileRead.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\R61\FileRead.cs" /> |     <Compile Include="Adaptation\FileHandlers\R61\FileRead.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\R62\FileRead.cs" /> |     <Compile Include="Adaptation\FileHandlers\R62\FileRead.cs" /> | ||||||
|     <Compile Include="Adaptation\FileHandlers\R65\FileRead.cs" /> |     <Compile Include="Adaptation\FileHandlers\R65\FileRead.cs" /> | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user