Skip to content

Commit

Permalink
taxonomy: fix proxy_ciqual_food_code (#8683)
Browse files Browse the repository at this point in the history 
fix typo in ciqual_proxy_food_code in taxonomy
  • Loading branch information
@stephanegigandet
stephanegigandet committed Jul 12, 2023
1 parent 32a5705 commit 0a2805a
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 23 deletions.
46 changes: 23 additions & 23 deletions taxonomies/ingredients.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2069,9 +2069,9 @@ wikidata:en:Q34172
wikipedia:en:https://en.wikipedia.org/wiki/Butter
vegan:en:no
vegetarian:en:yes
proxy_ciqual_food_code:en:16400
proxy_ciqual_food_name:en:Butter, 82% fat, unsalted
proxy_ciqual_food_name:fr:Beurre à 82% MG, doux
ciqual_proxy_food_code:en:16400
ciqual_proxy_food_name:en:Butter, 82% fat, unsalted
ciqual_proxy_food_name:fr:Beurre à 82% MG, doux
# ingredient/butter has 19735 products @2019-07-10

# description:en:All categories of butter are sold in both salted and unsalted forms. Either granular salt or a strong brine are added to salted butter during processing. In addition to enhanced flavor, the addition of salt acts as a preservative.
Expand Down Expand Up @@ -10332,8 +10332,8 @@ tr:Sığır eti
zh:牛肉
carbon_footprint_fr_foodges_ingredient:fr:Viande de bœuf moyen France
carbon_footprint_fr_foodges_value:fr:35.8
proxy_ciqual_food_code:en:6101
proxy_ciqual_food_name:fr:Boeuf, braisé
ciqual_proxy_food_code:en:6101
ciqual_proxy_food_name:fr:Boeuf, braisé

<en:beef meat
en:angus beef
Expand Down Expand Up @@ -15496,8 +15496,8 @@ description:fr:L’huile d'olive est une variété d'huile alimentaire, à base
description:nl:Olijfolie is een plantaardige olie die door persing uit olijven, de vruchten van de olijfboom, wordt gewonnen.
description:pt:Azeite é um produto alimentar extraído da azeitona, o fruto da oliveira.
#ingredient/olive-oil 26977 in 33 @2021-08-20
proxy_ciqual_food_code:en:17270
proxy_ciqual_food_name:fr:Huile d'olive vierge extra
ciqual_proxy_food_code:en:17270
ciqual_proxy_food_name:fr:Huile d'olive vierge extra



Expand Down Expand Up @@ -18593,8 +18593,8 @@ description:en:WHITE WINE is a wine whose colour can be straw-yellow, yellow-gre
# yue:白葡萄酒
wikidata:en:Q10210
wikipedia:en:https://en.wikipedia.org/wiki/White_wine
proxy_ciqual_food_code:en:5215
proxy_ciqual_food_name:fr:Vin blanc (sec)
ciqual_proxy_food_code:en:5215
ciqual_proxy_food_name:fr:Vin blanc (sec)
# en:white-wine has 2793 products in 5 languages @2018-10-29

<en:white wine
Expand Down Expand Up @@ -22433,9 +22433,9 @@ wikipedia:en:https://en.wikipedia.org/wiki/Semolina
wikidata:en:Q381350
carbon_footprint_fr_foodges_ingredient:fr:Semoule de blé dur
carbon_footprint_fr_foodges_value:fr:0.6
proxy_ciqual_food_code:en:9610
proxy_ciqual_food_name:en:Durum wheat semolina, raw
proxy_ciqual_food_name:fr:Semoule de blé dur, crue
ciqual_proxy_food_code:en:9610
ciqual_proxy_food_name:en:Durum wheat semolina, raw
ciqual_proxy_food_name:fr:Semoule de blé dur, crue
#980 @2021-09-28

#comment:en:This is in many languages synonym of en:wheat semolina
Expand Down Expand Up @@ -24993,8 +24993,8 @@ wikipedia:en:https://en.wikipedia.org/wiki/Wheat_flour
wikidata:en:Q2249305
carbon_footprint_fr_foodges_ingredient:fr:Farine de blé
carbon_footprint_fr_foodges_value:fr:1.2
proxy_ciqual_food_code:en:9410
proxy_ciqual_food_name:fr:Farine de blé tendre ou froment T110
ciqual_proxy_food_code:en:9410
ciqual_proxy_food_name:fr:Farine de blé tendre ou froment T110

<en:wheat flour
en:malted wheat flour, wheat malt flour
Expand Down Expand Up @@ -26433,8 +26433,8 @@ wikidata:en:Q5090
wikipedia:en:https://en.wikipedia.org/wiki/Rice
carbon_footprint_fr_foodges_ingredient:fr:Riz jasmin (Thaïlande)
carbon_footprint_fr_foodges_value:fr:1.4
proxy_ciqual_food_code:en:9100
proxy_ciqual_food_name:fr:Riz blanc, cru
ciqual_proxy_food_code:en:9100
ciqual_proxy_food_name:fr:Riz blanc, cru
vegan:en:yes
vegetarian:en:yes

Expand Down Expand Up @@ -47275,8 +47275,8 @@ wikipedia:en:https://en.wikipedia.org/wiki/Beetroot
carbon_footprint_fr_foodges_ingredient:fr:Betteraves
carbon_footprint_fr_foodges_value:fr:0.2
# en:beetroot has 319 products in 5 languages @2018-10-22
proxy_ciqual_food_code:en:20091
proxy_ciqual_food_name:fr:Betterave rouge, crue
ciqual_proxy_food_code:en:20091
ciqual_proxy_food_name:fr:Betterave rouge, crue

# Sometimes it is indicated as a colour.

Expand Down Expand Up @@ -78057,8 +78057,8 @@ fr:poulet fermier, poulet fermier élevé en plein air
<en:chicken
en:whole chicken, whole chickens
fr:poulet entier, poulets entiers
proxy_ciqual_food_code:en:36005
proxy_ciqual_food_name:fr:Poulet, viande et peau, rôti/cuit au four
ciqual_proxy_food_code:en:36005
ciqual_proxy_food_name:fr:Poulet, viande et peau, rôti/cuit au four

<en:animal protein
<en:chicken
Expand Down Expand Up @@ -80969,8 +80969,8 @@ wikidata:en:Q178
wikipedia:en:https://en.wikipedia.org/wiki/Pasta
carbon_footprint_fr_foodges_ingredient:fr:Pâtes sèches
carbon_footprint_fr_foodges_value:fr:0.5
proxy_ciqual_food_code:en:9810
proxy_ciqual_food_name:fr:Pâtes sèches standard, crues
ciqual_proxy_food_code:en:9810
ciqual_proxy_food_name:fr:Pâtes sèches standard, crues
# ingredient/fr:pâtes-alimentaires has 115 products 2019-05-20
# ingredient/paste has 1809 products @2018-12-10

Expand Down Expand Up @@ -86080,4 +86080,4 @@ en:creaming powder, creamer
ja:クリーミングパウダー

en:creaming agent
fr:agent de crémage
fr:agent de crémage
47 changes: 47 additions & 0 deletions ...ntegration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,53 @@
"sugars_unit" : "g",
"sugars_value" : 12.5
},
"nutriments_estimated" : {
"alcohol_100g" : 0,
"beta-carotene_100g" : 3.125e-06,
"calcium_100g" : 0.0198046875,
"carbohydrates_100g" : 52.23125,
"cholesterol_100g" : 0,
"copper_100g" : 0.000192765625,
"energy-kcal_100g" : 249.90625,
"energy-kj_100g" : 1059.375,
"energy_100g" : 1059.375,
"fat_100g" : 0.9375,
"fiber_100g" : 4.25,
"fructose_100g" : 0.0625,
"galactose_100g" : 0,
"glucose_100g" : 0.0625,
"iodine_100g" : 0.000180653125,
"iron_100g" : 0.00141503125,
"lactose_100g" : 0.0625,
"magnesium_100g" : 0.046260625,
"maltose_100g" : 0.65,
"manganese_100g" : 0.001386994375,
"pantothenic-acid_100g" : 0.0003,
"phosphorus_100g" : 0.13825,
"phylloquinone_100g" : 2.5e-07,
"polyols_100g" : 0,
"potassium_100g" : 0.177986875,
"proteins_100g" : 6.00625,
"salt_100g" : 9.21005625,
"saturated-fat_100g" : 0.16875,
"selenium_100g" : 6.859375e-06,
"sodium_100g" : 3.6678409375,
"starch_100g" : 37.0625,
"sucrose_100g" : 9.70625,
"sugars_100g" : 10.35625,
"vitamin-a_100g" : 0,
"vitamin-b12_100g" : 0,
"vitamin-b1_100g" : 0.0001625,
"vitamin-b2_100g" : 4.90625e-06,
"vitamin-b6_100g" : 6.875e-05,
"vitamin-b9_100g" : 1.60625e-05,
"vitamin-c_100g" : 0.00015625,
"vitamin-d_100g" : 8.125e-08,
"vitamin-e_100g" : 0.00049375,
"vitamin-pp_100g" : 3.125e-05,
"water_100g" : 26.51846875,
"zinc_100g" : 0.0011996875
},
"nutrition_data" : "on",
"nutrition_data_per" : "100g",
"nutrition_data_prepared_per" : "100g",
Expand Down
47 changes: 47 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_write/get-product.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,53 @@
"sugars_unit" : "g",
"sugars_value" : 12.5
},
"nutriments_estimated" : {
"alcohol_100g" : 0,
"beta-carotene_100g" : 3.125e-06,
"calcium_100g" : 0.0198046875,
"carbohydrates_100g" : 52.23125,
"cholesterol_100g" : 0,
"copper_100g" : 0.000192765625,
"energy-kcal_100g" : 249.90625,
"energy-kj_100g" : 1059.375,
"energy_100g" : 1059.375,
"fat_100g" : 0.9375,
"fiber_100g" : 4.25,
"fructose_100g" : 0.0625,
"galactose_100g" : 0,
"glucose_100g" : 0.0625,
"iodine_100g" : 0.000180653125,
"iron_100g" : 0.00141503125,
"lactose_100g" : 0.0625,
"magnesium_100g" : 0.046260625,
"maltose_100g" : 0.65,
"manganese_100g" : 0.001386994375,
"pantothenic-acid_100g" : 0.0003,
"phosphorus_100g" : 0.13825,
"phylloquinone_100g" : 2.5e-07,
"polyols_100g" : 0,
"potassium_100g" : 0.177986875,
"proteins_100g" : 6.00625,
"salt_100g" : 9.21005625,
"saturated-fat_100g" : 0.16875,
"selenium_100g" : 6.859375e-06,
"sodium_100g" : 3.6678409375,
"starch_100g" : 37.0625,
"sucrose_100g" : 9.70625,
"sugars_100g" : 10.35625,
"vitamin-a_100g" : 0,
"vitamin-b12_100g" : 0,
"vitamin-b1_100g" : 0.0001625,
"vitamin-b2_100g" : 4.90625e-06,
"vitamin-b6_100g" : 6.875e-05,
"vitamin-b9_100g" : 1.60625e-05,
"vitamin-c_100g" : 0.00015625,
"vitamin-d_100g" : 8.125e-08,
"vitamin-e_100g" : 0.00049375,
"vitamin-pp_100g" : 3.125e-05,
"water_100g" : 26.51846875,
"zinc_100g" : 0.0011996875
},
"nutrition_data" : "on",
"nutrition_data_per" : "100g",
"nutrition_data_prepared_per" : "100g",
Expand Down

0 comments on commit 0a2805a

Please sign in to comment.