From 29d70967861e32ad8c67adcd9bdc19fc018325ef Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Fri, 26 Apr 2024 21:55:54 +0300 Subject: Improve fittings regex --- .../DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'RhSolutions.Parsers') diff --git a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs index 218e9e0..5658766 100644 --- a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs +++ b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs @@ -5,11 +5,11 @@ namespace RhSolutions.Parsers.Fittings; public abstract class DrinkingWaterHeatingFitting : IProductParser { protected static readonly Regex _diameter = - new(@"([\b\D]|^)?(?16|20|25|32|40|50|63)([\b\D]|$)"); + new(@"(?16|20|25|32|40|50|63)[\b\D]?"); protected static readonly Regex _angle = - new(@"([\b\D])(?45|90)([\b\D]|$)"); + new(@"(?45|90)([\b\D]|$)"); protected static readonly Regex _thread = - new(@"([\b\D])(?1\s+1/4|1\s+1/2|1/2|3/4|2|1)([\b\D]|$)"); + new(@"(?1\s+1/4|1\s+1/2|1/2|3/4|2|1)([\b\D]|$)"); protected virtual string _title { get; } = string.Empty; -- cgit v1.2.3