Infineon.EAF.Runtime v2.61.1

Adaptation/FileHandlers/pcl/Constant.cs

@@ -9,7 +9,5 @@ internal class Constant
     public string Date { get; } = "Date:";
     public string StdDev { get; } = "Std Dev:";
     public string Average { get; } = "Average:";
-    public string Statistics { get; } = "Statistics:";
-    public string DatabaseId { get; } = "Database ID:";
 
 }

Adaptation/FileHandlers/pcl/Header.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Text.Json.Serialization;
 
 namespace Adaptation.FileHandlers.pcl;
@@ -216,35 +215,17 @@ public class Header
         return GetBefore(text, i, "\n", false);
     }
 
-    private static string? GetText(ReadOnlyDictionary<string, string> pages, Constant constant)
+    internal static Header Get(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName)
-    {
-        string? text;
-        string? headerFileName = null;
-        foreach (KeyValuePair<string, string> keyValuePair in pages)
-        {
-            if (!pages.TryGetValue(keyValuePair.Key, out text))
-                throw new Exception();
-            if (!text.Contains(constant.Statistics))
-                continue;
-            headerFileName = keyValuePair.Key;
-        }
-        headerFileName ??= pages.Count == 0 ? string.Empty : pages.ElementAt(pages.Count - 1).Key;
-        if (pages.Count == 0 || !pages.TryGetValue(headerFileName, out text))
-            text = null;
-        return text;
-    }
-
-    internal static Header Get(ReadOnlyDictionary<string, string> pages, Constant constant)
     {
         Header? result;
         string id;
+        string? text;
         string[] segmentsB;
         string[] segmentsC;
         int[] i = new int[] { 0 };
         WaferSummary waferSummary;
         List<WaferSummary> collection = new();
-        string? text = GetText(pages, constant);
+        if (!pages.TryGetValue(headerFileName, out text))
-        if (string.IsNullOrEmpty(text))
             throw new Exception();
         ScanPast(text, i, constant.Date);
         string date = GetToEOL(text, i);

Adaptation/FileHandlers/pcl/Run.cs

@@ -24,13 +24,13 @@ internal class Run
         Wafers = wafers;
     }
 
-    private static ReadOnlyCollection<Wafer> GetLastWaferForEachSlot(ReadOnlyDictionary<string, string> pages, Constant constant, Header header)
+    private static ReadOnlyCollection<Wafer> GetLastWaferForEachSlot(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName, Header header)
     {
         List<Wafer> results = new();
         string id;
         Wafer wafer;
         ReadOnlyCollection<Wafer>? wafers;
-        ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> keyValuePairs = Wafer.Get(pages, constant);
+        ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> keyValuePairs = Wafer.Get(pages, constant, headerFileName);
         ReadOnlyCollection<string> waferIds = GetWaferIds(header);
         for (int i = 0; i < waferIds.Count; i++)
         {
@@ -123,12 +123,13 @@ internal class Run
     {
         Run? result;
         Constant constant = new();
-        Header? header = Header.Get(pages, constant);
+        string headerFileName = pages.ElementAt(pages.Count - 1).Key;
+        Header? header = Header.Get(pages, constant, headerFileName);
         if (header is null)
             result = null;
         else
         {
-            ReadOnlyCollection<Wafer> wafers = GetLastWaferForEachSlot(pages, constant, header);
+            ReadOnlyCollection<Wafer> wafers = GetLastWaferForEachSlot(pages, constant, headerFileName, header);
             result = new(header, wafers);
             WriteJson(logistics, fileInfoCollection, result);
             WriteCommaSeparatedValues(logistics, result);

Adaptation/FileHandlers/pcl/Wafer.cs

@@ -114,7 +114,7 @@ public class Wafer
     public string Thruput { get; }
     public string Recipe { get; }
 
-    internal static ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> Get(ReadOnlyDictionary<string, string> pages, Constant constant)
+    internal static ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> Get(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName)
     {
         Dictionary<string, ReadOnlyCollection<Wafer>> results = new();
         Wafer wafer;
@@ -124,11 +124,15 @@ public class Wafer
         Dictionary<string, List<Wafer>> keyValuePairs = new();
         foreach (KeyValuePair<string, string> keyValuePair in pages)
         {
+            if (keyValuePair.Key == headerFileName)
+                continue;
+            if (!pages.ContainsKey(keyValuePair.Key))
+                throw new Exception();
             i[0] = 0;
             stringList = new();
             if (!pages.TryGetValue(keyValuePair.Key, out text))
                 throw new Exception();
-            if (string.IsNullOrEmpty(text) || !text.Contains(constant.Id) || text.Contains(constant.Statistics) || text.Contains(constant.DatabaseId))
+            if (string.IsNullOrEmpty(text) || !text.Contains(constant.Id))
                 continue;
             Header.ScanPast(text, i, constant.Date);
             string date = Header.GetToEOL(text, i);

Adaptation/FileHandlers/pdsf/Constant.cs

@@ -9,7 +9,5 @@ internal class Constant
     public string Date { get; } = "Date:";
     public string StdDev { get; } = "Std Dev:";
     public string Average { get; } = "Average:";
-    public string Statistics { get; } = "Statistics:";
-    public string DatabaseId { get; } = "Database ID:";
 
 }

Adaptation/FileHandlers/pdsf/Header.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Text.Json.Serialization;
 
 namespace Adaptation.FileHandlers.pdsf;
@@ -216,35 +215,17 @@ public class Header
         return GetBefore(text, i, "\n", false);
     }
 
-    private static string? GetText(ReadOnlyDictionary<string, string> pages, Constant constant)
+    internal static Header Get(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName)
-    {
-        string? text;
-        string? headerFileName = null;
-        foreach (KeyValuePair<string, string> keyValuePair in pages)
-        {
-            if (!pages.TryGetValue(keyValuePair.Key, out text))
-                throw new Exception();
-            if (!text.Contains(constant.Statistics))
-                continue;
-            headerFileName = keyValuePair.Key;
-        }
-        headerFileName ??= pages.Count == 0 ? string.Empty : pages.ElementAt(pages.Count - 1).Key;
-        if (pages.Count == 0 || !pages.TryGetValue(headerFileName, out text))
-            text = null;
-        return text;
-    }
-
-    internal static Header Get(ReadOnlyDictionary<string, string> pages, Constant constant)
     {
         Header? result;
         string id;
+        string? text;
         string[] segmentsB;
         string[] segmentsC;
         int[] i = new int[] { 0 };
         WaferSummary waferSummary;
         List<WaferSummary> collection = new();
-        string? text = GetText(pages, constant);
+        if (!pages.TryGetValue(headerFileName, out text))
-        if (string.IsNullOrEmpty(text))
             throw new Exception();
         ScanPast(text, i, constant.Date);
         string date = GetToEOL(text, i);

Adaptation/FileHandlers/pdsf/Run.cs

@@ -24,13 +24,13 @@ internal class Run
         Wafers = wafers;
     }
 
-    private static ReadOnlyCollection<Wafer> GetLastWaferForEachSlot(ReadOnlyDictionary<string, string> pages, Constant constant, Header header)
+    private static ReadOnlyCollection<Wafer> GetLastWaferForEachSlot(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName, Header header)
     {
         List<Wafer> results = new();
         string id;
         Wafer wafer;
         ReadOnlyCollection<Wafer>? wafers;
-        ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> keyValuePairs = Wafer.Get(pages, constant);
+        ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> keyValuePairs = Wafer.Get(pages, constant, headerFileName);
         ReadOnlyCollection<string> waferIds = GetWaferIds(header);
         for (int i = 0; i < waferIds.Count; i++)
         {
@@ -123,12 +123,13 @@ internal class Run
     {
         Run? result;
         Constant constant = new();
-        Header? header = Header.Get(pages, constant);
+        string headerFileName = pages.ElementAt(pages.Count - 1).Key;
+        Header? header = Header.Get(pages, constant, headerFileName);
         if (header is null)
             result = null;
         else
         {
-            ReadOnlyCollection<Wafer> wafers = GetLastWaferForEachSlot(pages, constant, header);
+            ReadOnlyCollection<Wafer> wafers = GetLastWaferForEachSlot(pages, constant, headerFileName, header);
             result = new(header, wafers);
             WriteJson(logistics, fileInfoCollection, result);
             WriteCommaSeparatedValues(logistics, result);

Adaptation/FileHandlers/pdsf/Wafer.cs

@@ -114,7 +114,7 @@ public class Wafer
     public string Thruput { get; }
     public string Recipe { get; }
 
-    internal static ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> Get(ReadOnlyDictionary<string, string> pages, Constant constant)
+    internal static ReadOnlyDictionary<string, ReadOnlyCollection<Wafer>> Get(ReadOnlyDictionary<string, string> pages, Constant constant, string headerFileName)
     {
         Dictionary<string, ReadOnlyCollection<Wafer>> results = new();
         Wafer wafer;
@@ -124,12 +124,10 @@ public class Wafer
         Dictionary<string, List<Wafer>> keyValuePairs = new();
         foreach (KeyValuePair<string, string> keyValuePair in pages)
         {
-            i[0] = 0;
+            if (keyValuePair.Key == headerFileName)
-            stringList = new();
-            if (!pages.TryGetValue(keyValuePair.Key, out text))
-                throw new Exception();
-            if (string.IsNullOrEmpty(text) || !text.Contains(constant.Id) || text.Contains(constant.Statistics) || text.Contains(constant.DatabaseId))
                 continue;
+            if (!pages.ContainsKey(keyValuePair.Key))
+                throw new Exception();
             i[0] = 0;
             stringList = new();
             if (!pages.TryGetValue(keyValuePair.Key, out text))

Adaptation/_Tests/Extract/Production/v2.61.1/TENCOR1.cs

@@ -54,7 +54,9 @@ public class TENCOR1
         NonThrowTryCatch();
     }
 
+#if DEBUG
     [Ignore]
+#endif
     [TestMethod]
     public void Production__v2_61_1__TENCOR1__pcl638959627725124236__Extra()
     {

MET08DDUPSFS6420.csproj

@@ -195,13 +195,13 @@
       <Version>7.2.4630.5</Version>
     </PackageReference>
     <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.61.1</Version>
+      <Version>2.60.0</Version>
     </PackageReference>
     <PackageReference Include="Pdfbox">
       <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>8.0.3</Version>
+      <Version>8.0.5</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />