Merge pull request #208 from American-Institutes-for-Research/HEA-815/miking_animals_regex

Hea 815/miking animals regex

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -326,7 +326,7 @@
         "lactation_days"
     ],
     [
-        "no. milking animals",
+        "(?:no\\.|no|number) milking animals",
         null,
         false,
         "milking_animals"
@@ -542,19 +542,19 @@
         null
     ],
     [
-        "{nbr_pattern} (d')?animaux laitiers",
+        "{nbr_pattern} (?:d')?animaux (?:laitiers|lactants)",
         null,
         false,
         "milking_animals"
     ],
     [
-        "(?P<season>saison 1): {nbr_pattern} animaux (?:laitiers|lactants)",
+        "(?P<season>saison (?:1|pluvieuse|hivernage)): {nbr_pattern} (?:d')?animaux (?:laitiers|lactants)",
         "MilkProduction",
         false,
         "milking_animals"
     ],
     [
-        "(?P<season>saison 2): {nbr_pattern} animaux (?:laitiers|lactants)",
+        "(?P<season>saison (?:2|seche|sèche)): {nbr_pattern} (?:d')?animaux (?:laitiers|lactants)",
         "MilkProduction",
         true,
         "milking_animals"

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -18,6 +18,12 @@
     "no. milking animals": {
         "attribute": "milking_animals"
     },
+    "no milking animals": {
+        "attribute": "milking_animals"
+    },
+    "number milking animals": {
+        "attribute": "milking_animals"
+    },
     "season 1: lactation period (days)": {
         "strategy_type": "MilkProduction",
         "season": "season 1",
@@ -304,17 +310,62 @@
     "nb d'animaux laitiers": {
         "attribute": "milking_animals"
     },
+    "nbr d'animaux laitiers": {
+        "attribute": "milking_animals"
+    },
+    "nb animaux laitiers": {
+        "attribute": "milking_animals"
+    },
+    "nbr animaux lactants": {
+        "attribute": "milking_animals"
+    },
+    "nbr d'animaux lactants": {
+        "attribute": "milking_animals"
+    },
     "saison 1: nb animaux laitiers": {
         "strategy_type": "MilkProduction",
         "season": "saison 1",
         "attribute": "milking_animals"
     },
+    "saison 1: nbr d'animaux lactants": {
+        "strategy_type": "MilkProduction",
+        "season": "saison 1",
+        "attribute": "milking_animals"
+    },
+    "saison pluvieuse: nb animaux laitiers": {
+        "strategy_type": "MilkProduction",
+        "season": "saison pluvieuse",
+        "attribute": "milking_animals"
+    },
+    "saison hivernage: nbr animaux lactants": {
+        "strategy_type": "MilkProduction",
+        "season": "saison hivernage",
+        "attribute": "milking_animals"
+    },
     "saison 2: nb animaux laitiers": {
         "strategy_type": "MilkProduction",
         "is_start": true,
         "season": "saison 2",
         "attribute": "milking_animals"
     },
+    "saison 2: nbr d'animaux lactants": {
+        "strategy_type": "MilkProduction",
+        "is_start": true,
+        "season": "saison 2",
+        "attribute": "milking_animals"
+    },
+    "saison seche: nb animaux laitiers": {
+        "strategy_type": "MilkProduction",
+        "is_start": true,
+        "season": "saison seche",
+        "attribute": "milking_animals"
+    },
+    "saison sèche: nbr animaux lactants": {
+        "strategy_type": "MilkProduction",
+        "is_start": true,
+        "season": "saison sèche",
+        "attribute": "milking_animals"
+    },
     "période de lactation (jours)": {
         "attribute": "lactation_days"
     },