phares3757/met08resimapcde
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MET08RESIMAPCDE - v2.43.4 - CDE2 Title bug fix

Browse Source
This commit is contained in:
Mike Phares 2022-08-17 09:00:41 -07:00
parent 1d7368c44e
commit 2205b7918c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Adaptation/.vscode/settings.json vendored
View File

@ -38,7 +38,8 @@
"titleBar.activeBackground": "#7e669d", "titleBar.activeBackground": "#7e669d",
"titleBar.activeForeground": "#e7e7e7", "titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#7e669d99", "titleBar.inactiveBackground": "#7e669d99",
"titleBar.inactiveForeground": "#e7e7e799" "titleBar.inactiveForeground": "#e7e7e799",
"commandCenter.border": "#e7e7e799"
}, },
"peacock.color": "#7e669d", "peacock.color": "#7e669d",
"cSpell.enabled": false "cSpell.enabled": false

6
Adaptation/FileHandlers/txt/ProcessData.cs
View File

@ -269,7 +269,7 @@ public class ProcessData : IProcessData
else else
{ {
// Remove illegal characters \/:*?"<>| found in the run. // Remove illegal characters \/:*?"<>| found in the run.
title = Regex.Replace(text.Trim(), @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; title = Regex.Replace(text, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
if (title.StartsWith("1T") || title.StartsWith("1t")) if (title.StartsWith("1T") || title.StartsWith("1t"))
title = title.Substring(2); title = title.Substring(2);
run = title; run = title;
@ -343,6 +343,10 @@ public class ProcessData : IProcessData
ScanPast("DEVICE:"); ScanPast("DEVICE:");
recipe = GetBefore("RESISTIVITY SPEC:"); recipe = GetBefore("RESISTIVITY SPEC:");
} }
title = title.Trim();
if (title[0] != '[' && title[title.Length - 1] != ']')
throw new Exception("Lot summary data is invalid or missing.");
title = title.Substring(1, title.Length - 2);
Descriptor descriptor = GetDescriptor(title); Descriptor descriptor = GetDescriptor(title);
psn = descriptor.PSN; psn = descriptor.PSN;
rds = descriptor.RDS; rds = descriptor.RDS;

3
Adaptation/_Tests/Shared/AdaptationTesting.cs
View File

@ -1250,12 +1250,13 @@ public class AdaptationTesting : ISMTP
if (!fileRead.IsDuplicator) if (!fileRead.IsDuplicator)
{ {
Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1));
Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!"); Assert.IsNotNull(extractResult.Item3);
Assert.IsNotNull(extractResult.Item4); Assert.IsNotNull(extractResult.Item4);
if (!validatePDSF) if (!validatePDSF)
_ = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, new(string.Empty, Array.Empty<string>(), Array.Empty<string>())); _ = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, new(string.Empty, Array.Empty<string>(), Array.Empty<string>()));
else else
{ {
Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!");
Tuple<string, string[], string[]> pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]); Tuple<string, string[], string[]> pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]);
Tuple<string, string[], string[]> pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf); Tuple<string, string[], string[]> pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf);
CompareSave(variables[5], pdsf, pdsfNew); CompareSave(variables[5], pdsf, pdsfNew);