Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: warnings modperl_error_log #10344

Merged
merged 5 commits into from
Jun 4, 2024
Merged

fix: warnings modperl_error_log #10344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55852d3
fix wanings modperl_error_log
benbenben2 May 23, 2024
952ec15
Apply suggestions from code review
benbenben2 May 26, 2024
5069573
apply suggestions
benbenben2 May 26, 2024
93c10cd
Merge branch 'main' into fix_wanings_modperl_error_log
benbenben2 Jun 1, 2024
c32cf48
fix tests
stephanegigandet Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,8 @@ sub display_text_content ($request_ref, $textid, $text_lc, $file) {
}

if ((defined $request_ref->{page}) and ($request_ref->{page} > 1)) {
$request_ref->{title} = $title . lang("title_separator") . sprintf(lang("page_x"), $request_ref->{page});
$request_ref->{title}
= ($title // '') . lang("title_separator") . sprintf(lang("page_x"), $request_ref->{page});
}
else {
$request_ref->{title} = $title;
Expand Down Expand Up @@ -9052,7 +9053,10 @@ sub data_to_display_nutrient_levels ($product_ref) {
foreach my $nutrient_level_ref (@nutrient_levels) {
my ($nid, $low, $high) = @{$nutrient_level_ref};

if ((defined $product_ref->{nutrient_levels}) and (defined $product_ref->{nutrient_levels}{$nid})) {
if ( (defined $product_ref->{nutrient_levels})
and (defined $product_ref->{nutrient_levels}{$nid})
and (defined $product_ref->{nutriments}{$nid . $prepared . "_100g"}))
{

push @{$result_data_ref->{nutrient_levels}}, {
nid => $nid,
Expand Down
11 changes: 8 additions & 3 deletions lib/ProductOpener/KnowledgePanels.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,10 +719,13 @@ sub create_environment_card_panel ($product_ref, $target_lc, $target_cc, $option
if ($options{product_type} eq "food") {
create_ecoscore_panel($product_ref, $target_lc, $target_cc, $options_ref);

if ( (defined $product_ref->{ecoscore_data})
if (
(defined $product_ref->{ecoscore_data})
and (defined $product_ref->{ecoscore_data}{adjustments})
and (defined $product_ref->{ecoscore_data}{adjustments}{threatened_species})
and ($product_ref->{ecoscore_data}{adjustments}{threatened_species}{value} != 0))
and (defined $product_ref->{ecoscore_data}{adjustments}{threatened_species}{value}
&& $product_ref->{ecoscore_data}{adjustments}{threatened_species}{value} != 0)
)
{

create_panel_from_json_template("palm_oil", "api/knowledge-panels/environment/palm_oil.tt.json",
Expand Down Expand Up @@ -1155,7 +1158,9 @@ sub create_serving_size_panel ($product_ref, $target_lc, $target_cc, $options_re
# Generate a panel only for food products that have a serving size
if (defined $product_ref->{serving_size}) {
my $serving_warning = undef;
if (($product_ref->{serving_quantity} <= 5) and ($product_ref->{nutrition_data_per} eq 'serving')) {
if ( (defined $product_ref->{serving_quantity} && $product_ref->{serving_quantity} <= 5)
and ($product_ref->{nutrition_data_per} eq 'serving'))
{
$serving_warning = lang_in_other_lc($target_lc, "serving_too_small_for_nutrition_analysis");
}
my $panel_data_ref = {"serving_warning" => $serving_warning,};
Expand Down
8 changes: 5 additions & 3 deletions lib/ProductOpener/Products.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ Boolean value indicating if the code is valid or not.
=cut

sub is_valid_code ($code) {
# Return an empty string if $code is undef
return '' if !defined $code;
return $code =~ /^\d{4,24}$/;
}

Expand Down Expand Up @@ -2338,12 +2340,12 @@ sub compute_product_history_and_completeness ($product_data_root, $current_produ
my $number_of_units = $packagings_ref->{number_of_units};
my $weight_measured = $packagings_ref->{weight_measured};

$packagings_data_signature .= "number_of_units:" . ($number_of_units || '') . ',';
$packagings_data_signature .= "number_of_units:" . ($number_of_units // '') . ',';
foreach my $property (qw(shape material recycling quantity_per_unit)) {
$packagings_data_signature .= $property . ":" . ($packagings_ref->{$property} || '') . ',';
$packagings_data_signature .= $property . ":" . ($packagings_ref->{$property} // '') . ',';
}
$packagings_data_signature .= "\n";
$packagings_weights_signature .= ($weight_measured || '') . "\n";
$packagings_weights_signature .= ($weight_measured // '') . "\n";
}
# If the signature is empty or contains only line feeds, we don't have data
if ($packagings_data_signature !~ /^\s*$/) {
Expand Down
2 changes: 2 additions & 0 deletions lib/ProductOpener/Tags.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3433,6 +3433,8 @@ sub list_taxonomy_tags_in_language ($target_lc, $tagtype, $tags_ref) {
}

sub canonicalize_tag2 ($tagtype, $tag) {
return $tag if !defined $tag;

#$tag = lc($tag);
my $canon_tag = $tag;
$canon_tag =~ s/^ //g;
Expand Down
10 changes: 6 additions & 4 deletions templates/api/knowledge-panels/environment/ecoscore/origins_of_ingredients.tt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
}
},
[% ELSE %]
[% IF product.ecoscore_data.adjustments.origins_of_ingredients.value <= 0 %]
[% IF product.ecoscore_data.adjustments.origins_of_ingredients.value.defined && product.ecoscore_data.adjustments.origins_of_ingredients.value <= 0 %]
"evaluation": "bad",
"title_element": {
"title": "[% edq(lang('ecoscore_origins_of_ingredients_impact_high')) %]",
[% ELSIF product.ecoscore_data.adjustments.origins_of_ingredients.value <= 15 %]
[% ELSIF product.ecoscore_data.adjustments.origins_of_ingredients.value.defined && product.ecoscore_data.adjustments.origins_of_ingredients.value <= 15 %]
"evaluation": "average",
"title_element": {
"title": "[% edq(lang('ecoscore_origins_of_ingredients_impact_medium')) %]",
Expand All @@ -38,7 +38,7 @@
"title_element": {
"title": "[% edq(lang('ecoscore_origins_of_ingredients_impact_low')) %]",
[% END %]
[% IF product.ecoscore_data.adjustments.origins_of_ingredients.value > 0 %]
[% IF product.ecoscore_data.adjustments.origins_of_ingredients.value.defined && product.ecoscore_data.adjustments.origins_of_ingredients.value > 0 %]
"subtitle": "[% edq(lang('bonus')) %][% sep %]: +[% product.ecoscore_data.adjustments.origins_of_ingredients.value %]",
[% ELSE %]
"subtitle": "[% edq(lang('malus')) %][% sep %]: [% product.ecoscore_data.adjustments.origins_of_ingredients.value %]",
Expand Down Expand Up @@ -89,7 +89,9 @@
"percent": [% round(origin.percent) %],
// EPI bonus goes from -5 to 5 with the formula bonus = epi_score / 10 - 5
// Transportation bonus goes from 0 to 15 with the formula bonus = transportation_score * 0.15
[% SET score = origin.epi_score / 10 - 5 + origin.transportation_score * 0.15 %]
[% SET epi_score = origin.epi_score.defined ? origin.epi_score : 0 %]
[% SET transportation_score = origin.transportation_score.defined ? origin.transportation_score : 0 %]
[% SET score = epi_score / 10 - 5 + transportation_score * 0.15 %]
[% IF score >= 15 %]
"evaluation": "good",
[% ELSIF score <= 0 %]
Expand Down
2 changes: 1 addition & 1 deletion templates/api/knowledge-panels/environment/ecoscore/threatened_species.tt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
]
[% ELSIF product.ecoscore_data.adjustments.threatened_species.value < 0 %]
[% ELSIF product.ecoscore_data.adjustments.threatened_species.value.defined && product.ecoscore_data.adjustments.threatened_species.value < 0 %]
"evaluation": "bad",
"title_element": {
"title": "[% edq(lang('ecoscore_ingredients_whose_cultivation_threatens_species')) %]",
Expand Down
3 changes: 2 additions & 1 deletion templates/api/knowledge-panels/environment/ecoscore/total.tt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[% SET sum_of_bonuses_and_maluses = product.ecoscore_data.adjustments.production_system.value + product.ecoscore_data.adjustments.packaging.value + product.ecoscore_data.adjustments.threatened_species.value + product.ecoscore_data.adjustments.origins_of_ingredients.value %]
[% SET sum_of_bonuses_and_maluses = (product.ecoscore_data.adjustments.production_system.value || 0) + (product.ecoscore_data.adjustments.packaging.value || 0) + (product.ecoscore_data.adjustments.threatened_species.value || 0) + (product.ecoscore_data.adjustments.origins_of_ingredients.value || 0) %]

{
"level": "info",
"topics": [
Expand Down
8 changes: 4 additions & 4 deletions templates/web/pages/product/includes/ecoscore_details.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h3>[% lang('ecoscore_additional_bonuses_and_maluses') %]</h3>
<div class="panel ecoscore_panel" id="ecoscore_panel_production_system" data-equalizer-watch="ecoscore1">
<h4>[% display_icon('agriculture') %] [% lang('ecoscore_production_system') %]</h4>

[% IF adjustments.production_system.value > 0 %]
[% IF adjustments.production_system.value.defined && adjustments.production_system.value > 0 %]

<ul>
[% FOREACH label IN adjustments.production_system.labels %]
Expand Down Expand Up @@ -164,8 +164,8 @@ <h4>[% display_icon('public') %] [% lang('ecoscore_origins_of_ingredients') %]</
[% END %]

<p>
<strong>[% lang('ecoscore_environmental_policy') %][% sep %]: [% IF adjustments.origins_of_ingredients.epi_value > 0 %]+[% END %][% round(adjustments.origins_of_ingredients.epi_value) %]</strong><br>
<strong>[% lang('ecoscore_transportation') %][% sep %]: [% IF adjustments.origins_of_ingredients.transportation_value > 0 %]+[% END %][% round(adjustments.origins_of_ingredients.transportation_value) %]</strong><br>
<strong>[% lang('ecoscore_environmental_policy') %][% sep %]: [% IF adjustments.origins_of_ingredients.epi_value.defined && adjustments.origins_of_ingredients.epi_value > 0 %]+[% END %][% round(adjustments.origins_of_ingredients.epi_value) %]</strong><br>
<strong>[% lang('ecoscore_transportation') %][% sep %]: [% IF adjustments.origins_of_ingredients.epi_value.defined && adjustments.origins_of_ingredients.transportation_value > 0 %]+[% END %][% round(adjustments.origins_of_ingredients.transportation_value) %]</strong><br>
</p>
</div>
</div>
Expand Down Expand Up @@ -233,7 +233,7 @@ <h4>[% display_icon('packaging') %] [% lang('ecoscore_packaging') %]</h4>
<p>[% lang('ecoscore_score_of_all_components') %][% sep %]: [% adjustments.packaging.score %]</p>
[% END %]

<p><strong>[% lang('ecoscore_packaging') %][% sep %]: [% IF adjustments.packaging.value > 0 %]+[% END %][% adjustments.packaging.value %]</strong></p>
<p><strong>[% lang('ecoscore_packaging') %][% sep %]: [% IF adjustments.packaging.value.defined && adjustments.packaging.value > 0 %]+[% END %][% adjustments.packaging.value %]</strong></p>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/expected_test_results/api_v2_product_read/get-existing-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion ...ed_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion ...cted_test_results/api_v2_product_write/get-product-ingredients-text-without-language.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/expected_test_results/api_v2_product_write/get-product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
2 changes: 1 addition & 1 deletion ...integration/expected_test_results/api_v3_product_read/get-existing-product-gs1-caret.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"origins_of_ingredients" : {
"aggregated_origins" : [
{
"epi_score" : 0,
"epi_score" : "0",
"origin" : "en:unknown",
"percent" : 100,
"transportation_score" : null
Expand Down
8 changes: 4 additions & 4 deletions tests/update_tests_results.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ rm /mnt/podata/data/categories_stats/*.*
# Unit tests

# all tests use init_expected_results function
for FILE in $(grep -l init_expected_results unit/*.t);
do
perl $FILE --update-expected-results
done
#for FILE in $(grep -l init_expected_results unit/*.t);
#do
# perl $FILE --update-expected-results
#done

# Integration tests

Expand Down
Loading