Update to fix issue #91

PatrickRitchie · PatrickRitchie · commit cfed9350349a · 2025-01-15T00:23:08.000-05:00
diff --git a/libraries/MTConnect.NET-Common/Devices/Component.cs b/libraries/MTConnect.NET-Common/Devices/Component.cs
@@ -796,7 +796,7 @@ public IDataItem GetDataItemByType(string type, SearchType searchType = SearchTy
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.FirstOrDefault(o => o.Type == type);
+					return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper());
 				}
 			}
 
@@ -819,7 +819,7 @@ public IDataItem GetDataItemByType(string type, string subType, SearchType searc
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType);
+					return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());
 				}
 			}
 
@@ -860,7 +860,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, SearchType searchT
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.Where(o => o.Type == type);
+					return dataItems.Where(o => o.Type == type.ToUnderscoreUpper());
 				}
 			}
 
@@ -883,7 +883,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, string subType, Se
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.Where(o => o.Type == type && o.SubType == subType);
+					return dataItems.Where(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());
 				}
 			}
 
diff --git a/libraries/MTConnect.NET-Common/Devices/Device.cs b/libraries/MTConnect.NET-Common/Devices/Device.cs
@@ -765,7 +765,7 @@ public IDataItem GetDataItemByType(string type, SearchType searchType = SearchTy
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.FirstOrDefault(o => o.Type == type);
+					return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper());
 				}
 			}
 
@@ -788,7 +788,7 @@ public IDataItem GetDataItemByType(string type, string subType, SearchType searc
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType);
+					return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());
 				}
 			}
 
@@ -852,7 +852,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, string subType, Se
 
 				if (!dataItems.IsNullOrEmpty())
 				{
-					return dataItems.Where(o => o.Type == type && o.SubType == subType);
+					return dataItems.Where(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -796,7 +796,7 @@ public IDataItem GetDataItemByType(string type, SearchType searchType = SearchTy`
`796`	`796`
`797`	`797`	`if (!dataItems.IsNullOrEmpty())`
`798`	`798`	`{`
`799`		`- return dataItems.FirstOrDefault(o => o.Type == type);`
	`799`	`+ return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper());`
`800`	`800`	`}`
`801`	`801`	`}`
`802`	`802`
`@@ -819,7 +819,7 @@ public IDataItem GetDataItemByType(string type, string subType, SearchType searc`
`819`	`819`
`820`	`820`	`if (!dataItems.IsNullOrEmpty())`
`821`	`821`	`{`
`822`		`- return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType);`
	`822`	`+ return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());`
`823`	`823`	`}`
`824`	`824`	`}`
`825`	`825`
`@@ -860,7 +860,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, SearchType searchT`
`860`	`860`
`861`	`861`	`if (!dataItems.IsNullOrEmpty())`
`862`	`862`	`{`
`863`		`- return dataItems.Where(o => o.Type == type);`
	`863`	`+ return dataItems.Where(o => o.Type == type.ToUnderscoreUpper());`
`864`	`864`	`}`
`865`	`865`	`}`
`866`	`866`
`@@ -883,7 +883,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, string subType, Se`
`883`	`883`
`884`	`884`	`if (!dataItems.IsNullOrEmpty())`
`885`	`885`	`{`
`886`		`- return dataItems.Where(o => o.Type == type && o.SubType == subType);`
	`886`	`+ return dataItems.Where(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());`
`887`	`887`	`}`
`888`	`888`	`}`
`889`	`889`
Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ public IDataItem GetDataItemByType(string type, SearchType searchType = SearchTy`
`765`	`765`
`766`	`766`	`if (!dataItems.IsNullOrEmpty())`
`767`	`767`	`{`
`768`		`- return dataItems.FirstOrDefault(o => o.Type == type);`
	`768`	`+ return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper());`
`769`	`769`	`}`
`770`	`770`	`}`
`771`	`771`
`@@ -788,7 +788,7 @@ public IDataItem GetDataItemByType(string type, string subType, SearchType searc`
`788`	`788`
`789`	`789`	`if (!dataItems.IsNullOrEmpty())`
`790`	`790`	`{`
`791`		`- return dataItems.FirstOrDefault(o => o.Type == type && o.SubType == subType);`
	`791`	`+ return dataItems.FirstOrDefault(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());`
`792`	`792`	`}`
`793`	`793`	`}`
`794`	`794`
`@@ -852,7 +852,7 @@ public IEnumerable<IDataItem> GetDataItemsByType(string type, string subType, Se`
`852`	`852`
`853`	`853`	`if (!dataItems.IsNullOrEmpty())`
`854`	`854`	`{`
`855`		`- return dataItems.Where(o => o.Type == type && o.SubType == subType);`
	`855`	`+ return dataItems.Where(o => o.Type == type.ToUnderscoreUpper() && o.SubType == subType.ToUnderscoreUpper());`
`856`	`856`	`}`
`857`	`857`	`}`
`858`	`858`