Regex adjustments - see HEA-809

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -92,43 +92,19 @@
         "people_per_household"
     ],
     [
-        "(?P<product_id>{label_pattern}{separator_pattern}{label_pattern}) {age_gender_pattern}{separator_pattern}\\({unit_of_measure_pattern}(?: collectés?|gathered)?\\)",
+        "{product_pattern}{separator_pattern} {age_gender_pattern} ?\\(?{unit_of_measure_pattern}(?: collectés?|gathered)?\\)?",
         null,
         true,
         "quantity_produced"
     ],
     [
-        "{product_pattern}{separator_pattern} {age_gender_pattern} ?\\({unit_of_measure_pattern}(?: collectés?|gathered)?\\)",
-        null,
-        true,
-        "quantity_produced"
-    ],
-    [
-        "{product_pattern}: {label_pattern} {age_gender_pattern} \\({unit_of_measure_pattern}(?: collectés?|gathered)?\\)",
-        null,
-        true,
-        "quantity_produced"
-    ],
-    [
-        "{product_pattern}{separator_pattern} {age_gender_pattern}{separator_pattern} (?:no\\.|nbr?\\.) people per hh",
+        "{product_pattern}{separator_pattern} {age_gender_pattern}{separator_pattern} {nbr_pattern} (?:de )?(?:pers|personnes|people)(?: ?/ ?| par | per )(?:ménage|mènage|hh)",
         null,
         true,
         "people_per_household"
     ],
     [
-        "{product_pattern} *: *{age_gender_pattern}",
-        null,
-        true,
-        null
-    ],
-    [
-        "{product_pattern} +{age_gender_pattern}",
-        null,
-        true,
-        null
-    ],
-    [
-        "{age_gender_pattern} {product_pattern}",
+        "{product_pattern}{separator_pattern} {age_gender_pattern}",
         null,
         true,
         null

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -1087,9 +1087,9 @@
         "product_id": "threshing, harvesting",
         "household_labor_provider": "women"
     },
-    "poisson : peche homme (kg collectés)": {
+    "poisson/peche homme (kg collectés)": {
         "is_start": true,
-        "product_id": "poisson : peche",
+        "product_id": "poisson/peche",
         "household_labor_provider": "men",
         "unit_of_measure_id": "kg",
         "attribute": "quantity_produced"