fix: remove warning in Display.pm related to Environmental Scoring (#…

…11172) **Fixed the following** Use of uninitialized value in uc at /opt/product-opener/lib/ProductOpener/Display.pm line 8006. Argument "" isn't numeric in sprintf at /opt/product-opener/lib/ProductOpener/Display.pm line 467. --------- Co-authored-by: Pierre Slamich <[email protected]> Co-authored-by: Alex Garel <[email protected]>
openfoodfacts · Jan 7, 2025 · 176fe9e · 176fe9e
1 parent 16acef0
commit 176fe9e
Show file tree

Hide file tree

Showing 48 changed files with 71 additions and 54 deletions.
diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -421,8 +421,15 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re
 	};
 
 	$template_data_ref->{round} = sub ($var) {
-		return sprintf("%.0f", $var);
+		# Check if $var is defined and is numeric
+		if (defined $var && $var =~ /^-?\d+(\.\d+)?$/) {
+			return sprintf("%.0f", $var);
+		}
+		else {
+			return;
+		}
 	};
+
 	$template_data_ref->{sprintf} = sub ($var1, $var2) {
 		return sprintf($var1, $var2);
 	};
@@ -5455,7 +5462,11 @@ sub search_and_display_products ($request_ref, $query_ref, $sort_by, $limit, $pa
 			$cursor = execute_query(
 				sub {
 					return get_products_collection(get_products_collection_request_parameters($request_ref))
-						->query($query_ref)->fields($fields_ref)->sort($sort_ref)->limit($limit)->skip($skip);
+						->query($query_ref)
+						->fields($fields_ref)
+						->sort($sort_ref)
+						->limit($limit)
+						->skip($skip);
 				}
 			);
 			$log->debug("MongoDB query ok", {error => $@}) if $log->is_debug();
@@ -6920,7 +6931,8 @@ sub search_and_graph_products ($request_ref, $query_ref, $graph_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields($fields_ref);
+					->query($query_ref)
+					->fields($fields_ref);
 			}
 		);
 	};
@@ -7230,7 +7242,8 @@ sub search_products_for_map ($request_ref, $query_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields(
+					->query($query_ref)
+					->fields(
 					{
 						code => 1,
 						lc => 1,
@@ -7953,8 +7966,11 @@ JS
 
 		localize_environmental_score($request_ref->{cc}, $product_ref);
 
-		$template_data_ref->{environmental_score_grade} = uc($product_ref->{environmental_score_data}{"grade"});
-		$template_data_ref->{environmental_score_grade_lc} = $product_ref->{environmental_score_data}{"grade"};
+		if (defined $product_ref->{environmental_score_data}{"grade"}) {
+			$template_data_ref->{environmental_score_grade} = uc($product_ref->{environmental_score_data}{"grade"});
+			$template_data_ref->{environmental_score_lc} = $product_ref->{environmental_score_data}{"grade"};
+		}
+
 		$template_data_ref->{environmental_score_score} = $product_ref->{environmental_score_data}{"score"};
 		$template_data_ref->{environmental_score_data} = $product_ref->{environmental_score_data};
 		$template_data_ref->{environmental_score_calculation_details}
@@ -11586,7 +11602,8 @@ sub search_and_analyze_recipes ($request_ref, $query_ref) {
 		$cursor = execute_query(
 			sub {
 				return get_products_collection(get_products_collection_request_parameters($request_ref))
-					->query($query_ref)->fields($fields_ref);
+					->query($query_ref)
+					->fields($fields_ref);
 			}
 		);
 	};

diff --git a/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/beverage-with-80-percent-milk.json
@@ -164,7 +164,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json b/tests/unit/expected_test_results/nutriscore/breakfast-cereals.json
@@ -78,7 +78,7 @@
       "salt" : 0.5525,
       "salt_100g" : 0.5525,
       "salt_unit" : "g",
-      "salt_value" : 0.5525,
+      "salt_value" : "0.5525",
       "saturated-fat_100g" : 1.03,
       "sodium_100g" : 0.221,
       "sodium_value" : 0.221,

diff --git a/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json b/tests/unit/expected_test_results/nutriscore/cocoa-and-chocolate-powders.json
@@ -68,7 +68,7 @@
       "salt_prepared" : 0.1125,
       "salt_prepared_100g" : 0.1125,
       "salt_prepared_unit" : "g",
-      "salt_prepared_value" : 0.1125,
+      "salt_prepared_value" : "0.1125",
       "saturated-fat_prepared_100g" : 1.1,
       "sodium_prepared_100g" : 0.045,
       "sodium_prepared_value" : 0.045,

diff --git a/tests/unit/expected_test_results/nutriscore/colza-oil.json b/tests/unit/expected_test_results/nutriscore/colza-oil.json
@@ -91,7 +91,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "7",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/cookies.json b/tests/unit/expected_test_results/nutriscore/cookies.json
@@ -73,7 +73,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "15",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-80-percent-milk.json
@@ -172,7 +172,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drink-with-less-than-80-percent-milk.json
@@ -168,7 +168,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json b/tests/unit/expected_test_results/nutriscore/dairy-drinks-without-milk.json
@@ -157,7 +157,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "5",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json b/tests/unit/expected_test_results/nutriscore/en-avocado-oil.json
@@ -159,7 +159,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-beers-category.json b/tests/unit/expected_test_results/nutriscore/en-beers-category.json
@@ -57,7 +57,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : 0,
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,

diff --git a/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json b/tests/unit/expected_test_results/nutriscore/en-beverage-preparation-flavored-syrup.json
@@ -203,7 +203,7 @@
       "salt_prepared" : 0.025,
       "salt_prepared_100g" : 0.025,
       "salt_prepared_unit" : "g",
-      "salt_prepared_value" : 0.025,
+      "salt_prepared_value" : "0.025",
       "saturated-fat_prepared_100g" : 0,
       "sodium_prepared_100g" : 0.01,
       "sodium_prepared_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json b/tests/unit/expected_test_results/nutriscore/en-cherry-tomatoes.json
@@ -154,7 +154,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : 2.48
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-milk.json b/tests/unit/expected_test_results/nutriscore/en-milk.json
@@ -73,7 +73,7 @@
       "sodium" : 0.04,
       "sodium_100g" : 0.04,
       "sodium_unit" : "g",
-      "sodium_value" : 0.04,
+      "sodium_value" : "0.04",
       "sugars_100g" : 4.8
    },
    "nutriscore" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-no-ingredients.json
@@ -97,7 +97,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriscore" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil-unrecognized-ingredients.json
@@ -153,7 +153,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriscore" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-olive-oil.json b/tests/unit/expected_test_results/nutriscore/en-olive-oil.json
@@ -162,7 +162,7 @@
       "sodium" : 0,
       "sodium_100g" : 0,
       "sodium_unit" : "g",
-      "sodium_value" : 0,
+      "sodium_value" : "0",
       "sugars_100g" : "0"
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category-and-ingredients.json
@@ -211,7 +211,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,

diff --git a/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json b/tests/unit/expected_test_results/nutriscore/en-orange-juice-category.json
@@ -84,7 +84,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,

diff --git a/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json b/tests/unit/expected_test_results/nutriscore/en-potatoes-category.json
@@ -80,7 +80,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,

diff --git a/...test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json b/...test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-lots-of-meat.json
@@ -220,7 +220,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/...cted_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json b/...cted_test_results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-no-meat.json
@@ -206,7 +206,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/..._results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json b/..._results/nutriscore/en-red-meat-ambiguous-category-ingredients-with-very-little-meat.json
@@ -256,7 +256,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/.../unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json b/.../unit/expected_test_results/nutriscore/en-red-meat-ambiguous-category-no-ingredients.json
@@ -69,7 +69,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json b/tests/unit/expected_test_results/nutriscore/en-red-meat-category-no-ingredients.json
@@ -78,7 +78,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "10",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json b/tests/unit/expected_test_results/nutriscore/en-soy-beans-processed-and-unprocessed.json
@@ -210,7 +210,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners-erythritol.json
@@ -217,7 +217,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/en-sweeteners.json b/tests/unit/expected_test_results/nutriscore/en-sweeteners.json
@@ -229,7 +229,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/en-tofu.json b/tests/unit/expected_test_results/nutriscore/en-tofu.json
@@ -199,7 +199,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json b/tests/unit/expected_test_results/nutriscore/en-vegetable-crisps.json
@@ -171,7 +171,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,

diff --git a/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json b/tests/unit/expected_test_results/nutriscore/flavored-spring-with-nutrition.json
@@ -75,7 +75,7 @@
       "salt" : 0,
       "salt_100g" : "0",
       "salt_unit" : "g",
-      "salt_value" : 0,
+      "salt_value" : "0",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0,
       "sodium_value" : "0",

diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json b/tests/unit/expected_test_results/nutriscore/fr-canned-green-beans.json
@@ -210,7 +210,7 @@
       "sodium" : 0.48,
       "sodium_100g" : 0.48,
       "sodium_unit" : "g",
-      "sodium_value" : 0.48,
+      "sodium_value" : "0.48",
       "sugars_100g" : 3.6
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json b/tests/unit/expected_test_results/nutriscore/fr-canned-pineapple.json
@@ -206,7 +206,7 @@
       "sodium" : 0.48,
       "sodium_100g" : 0.48,
       "sodium_unit" : "g",
-      "sodium_value" : 0.48,
+      "sodium_value" : "0.48",
       "sugars_100g" : 3.6
    },
    "nutriscore" : {

diff --git a/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json b/tests/unit/expected_test_results/nutriscore/fr-coconut-milk.json
@@ -158,7 +158,7 @@
       "sodium" : 0.012,
       "sodium_100g" : 0.012,
       "sodium_unit" : "g",
-      "sodium_value" : 0.012,
+      "sodium_value" : "0.012",
       "sugars_100g" : 0.5
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json b/tests/unit/expected_test_results/nutriscore/fr-gaspacho.json
@@ -351,7 +351,7 @@
       "salt" : 0.5,
       "salt_100g" : 0.5,
       "salt_unit" : "g",
-      "salt_value" : 0.5,
+      "salt_value" : "0.5",
       "saturated-fat_100g" : 0.2,
       "sodium_100g" : 0.2,
       "sodium_value" : 0.2,

diff --git a/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json b/tests/unit/expected_test_results/nutriscore/fr-green-beans-beverage.json
@@ -184,7 +184,7 @@
       "sodium" : 0.32,
       "sodium_100g" : 0.32,
       "sodium_unit" : "g",
-      "sodium_value" : 0.32,
+      "sodium_value" : "0.32",
       "sugars_100g" : 3.6
    },
    "nutriments_estimated" : {

diff --git a/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json b/tests/unit/expected_test_results/nutriscore/fr-ice-tea-with-sweetener.json
@@ -436,7 +436,7 @@
       "salt" : 0.025,
       "salt_100g" : 0.025,
       "salt_unit" : "g",
-      "salt_value" : 0.025,
+      "salt_value" : "0.025",
       "saturated-fat_100g" : "0",
       "sodium_100g" : 0.01,
       "sodium_value" : 0.01,