summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerghei Cebotari <serghei@cebotari.ru>2024-01-29 12:15:25 +0300
committerSerghei Cebotari <serghei@cebotari.ru>2024-01-29 12:15:25 +0300
commit73275fa29eab0ddadd72d78376db6faa0655d7e3 (patch)
treea4af005a48e720c8e4ad3375546f0cd558157b34
parentd1ecc451d9bc19d0664e21787c9a0ceb67505582 (diff)
Fix manifold regex
-rw-r--r--RhSolutions.Api.Tests/RautitanFittingsTests.cs1
-rw-r--r--RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs2
-rw-r--r--RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs2
3 files changed, 3 insertions, 2 deletions
diff --git a/RhSolutions.Api.Tests/RautitanFittingsTests.cs b/RhSolutions.Api.Tests/RautitanFittingsTests.cs
index 550881b..49a7bbe 100644
--- a/RhSolutions.Api.Tests/RautitanFittingsTests.cs
+++ b/RhSolutions.Api.Tests/RautitanFittingsTests.cs
@@ -135,6 +135,7 @@ public class RautitanFittingsTests : ProductQueryModifierTests
[TestCase("Распределительный коллектор G1 2 отвода G 3/4", "Распределительный коллектор G1 2")]
[TestCase("Коллектор Квартирный с отсекающими кранами, латунь ДУ20, НР-ВР 3/4\", 3 контура НР 1/2", "Распределительный коллектор G1 3")]
+ [TestCase("Коллектор Квартирный с отсекающими кранами, латунь ДУ20, НР-ВР 3/\", 4 контура НР 1/2\"", "Распределительный коллектор G1 4")]
public void ManifoldG1Test(string query, string modified)
=> Invoke(productType: "Коллектор G1", query, modified);
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs
index ec3ba93..5e364a8 100644
--- a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldG1.cs
@@ -6,7 +6,7 @@ namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
public class ManifoldG1 : DrinkingWaterHeatingFitting
{
private static readonly Regex _portsCount =
- new(@"\b(?<Ports>\d{1})\b");
+ new(@"\s(?<Ports>\d{1})\s");
protected override string _title => "Распределительный коллектор G1";
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs
index ce8dfe6..4b895fd 100644
--- a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ManifoldHLV.cs
@@ -5,7 +5,7 @@ namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
[MLModifierKey("Коллектор HLV")]
public class ManifoldHLV : DrinkingWaterHeatingFitting
{ private static readonly Regex _portsCount =
- new(@"\b(?<Ports>\d{1,2})\b");
+ new(@"\s(?<Ports>\d{1,2})\s");
protected override string _title => "Распределительный коллектор HLV";