ignore vegetable oil for palm oil detection if it has sub ingredients…

…, bug #2339
openfoodfacts · Sep 16, 2019 · 5fe0108 · 5fe0108
1 parent e98ec85
commit 5fe0108
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/lib/ProductOpener/Ingredients.pm b/lib/ProductOpener/Ingredients.pm
@@ -948,7 +948,6 @@ sub extract_ingredients_from_text($) {
 
 				if ($between ne '') {
 					$ingredient{has_sub_ingredients} = "yes";
-					$ingredient{from_palm_oil} = "ignore";
 				}
 
 				if (defined $percent) {
@@ -1099,6 +1098,12 @@ sub analyze_ingredients($) {
 					}
 				}
 
+				# Vegetable oil (rapeseed oil, ...) : ignore "from_palm_oil:en:maybe" if the ingredient has sub-ingredients
+				if (($property eq "from_palm_oil") and (defined $value) and ($value eq "maybe")
+					and (defined $ingredient_ref->{has_sub_ingredients}) and ($ingredient_ref->{has_sub_ingredients} eq "yes")) {
+					$value = "ignore";
+				}
+
 				not defined $value and $value = "undef";
 
 				defined $values{$value} or $values{$value} = 0;

diff --git a/t/ingredients.t b/t/ingredients.t
@@ -39,6 +39,7 @@ my $expected_product_ref =
       },
       {
         'id' => 'en:chocolate',
+	'has_sub_ingredients' => 'yes',
         'rank' => 2,
         'text' => 'chocolat',
 	'vegan' => 'maybe',
@@ -69,6 +70,7 @@ my $expected_product_ref =
       },
       {
         'id' => 'en:emulsifier',
+	'has_sub_ingredients' => 'yes',
         'rank' => 6,
         'text' => "\x{e9}mulsifiants"
       },
@@ -97,6 +99,7 @@ my $expected_product_ref =
       },
       {
         'id' => 'en:acidity-regulator',
+	'has_sub_ingredients' => 'yes',
         'rank' => 10,
         'text' => "correcteurs d'acidit\x{e9}"
       },
@@ -116,6 +119,7 @@ my $expected_product_ref =
       },
       {
         'id' => 'en:acid',
+	'has_sub_ingredients' => 'yes',
         'rank' => 13,
         'text' => 'acidifiant'
       },
@@ -363,12 +367,14 @@ $expected_product_ref =
     'ingredients' => [
       {
         'id' => 'fr:Marmelade d\'oranges',
+	'has_sub_ingredients' => 'yes',
         'percent' => '41',
         'rank' => 1,
         'text' => 'Marmelade d\'oranges'
       },
       {
         'id' => 'en:orange-pulp',
+	'has_sub_ingredients' => 'yes',
         'percent' => '0.6',
         'processing' => 'en:concentrated',
         'rank' => 2,
@@ -378,6 +384,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:gelling-agent',
+	'has_sub_ingredients' => 'yes',
         'rank' => 3,
         'text' => "g\x{e9}lifiant"
       },
@@ -390,6 +397,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:acid',
+	'has_sub_ingredients' => 'yes',
         'rank' => 5,
         'text' => 'acidifiant'
       },
@@ -402,6 +410,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:acidity-regulator',
+	'has_sub_ingredients' => 'yes',
         'rank' => 7,
         'text' => "correcteurs d'acidit\x{e9}"
       },
@@ -414,6 +423,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:thickener',
+	'has_sub_ingredients' => 'yes',
         'rank' => 9,
         'text' => "\x{e9}paississant"
       },
@@ -426,6 +436,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:chocolate',
+	'has_sub_ingredients' => 'yes',
         'percent' => '24.9',
         'rank' => 11,
         'text' => 'chocolat',
@@ -477,6 +488,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:raising-agent',
+	'has_sub_ingredients' => 'yes',
         'rank' => 18,
         'text' => "poudre \x{e0} lever"
       },
@@ -489,6 +501,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:emulsifier',
+	'has_sub_ingredients' => 'yes',
         'rank' => 20,
         'text' => "\x{e9}mulsifiant"
       },
@@ -520,6 +533,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:concentrated-orange-juice',
+	'has_sub_ingredients' => 'yes',
         'percent' => '1.4',
         'text' => "jus d'orange concentr\x{e9}",
         'vegan' => 'yes',
@@ -587,6 +601,7 @@ $expected_product_ref =
       },
       {
         'id' => 'en:emulsifier',
+	'has_sub_ingredients' => 'yes',
         'text' => "\x{e9}mulsifiant"
       },
       {
@@ -1117,6 +1132,7 @@ is_deeply ($product_ref->{ingredients},
 	     {
 	            'id' => 'en:emulsifier',
 	            'rank' => 1,
+		    'has_sub_ingredients' => 'yes',
 	            'text' => "\x{e9}mulsifiant"
 	          },
 	          {

diff --git a/t/ingredients_analysis.t b/t/ingredients_analysis.t
@@ -32,6 +32,7 @@ my @tests = (
 [ { lc => "en", ingredients_text => "modified palm oil" }, [ "en:palm-oil", "en:vegan", "en:vegetarian"] ],
 [ { lc => "fr", ingredients_text => "huiles végétales (huile de tournesol', huile de colza)" }, [ "en:palm-oil-free", "en:vegan", "en:vegetarian"] ],
 [ { lc => "fr", ingredients_text => "huiles végétales" }, [ "en:may-contain-palm-oil", "en:vegan", "en:vegetarian"] ],
+[ { lc => "fr", ingredients_text => "huile de poisson" }, [ "en:palm-oil-free", "en:non-vegan", "en:non-vegetarian"] ],
 );