Merge pull request #1381 from openfoodfacts/issue-1374/efsa-additives…

…-evals Issue 1374/efsa additives evals
openfoodfacts · Sep 25, 2018 · 1865646 · 1865646
2 parents 9ffea09 + 168677a
commit 1865646
Show file tree

Hide file tree

Showing 12 changed files with 1,453 additions and 93 deletions.
diff --git a/html/images/misc/additives-efsa-evaluation-overexposure-risk-icon-high.svg b/html/images/misc/additives-efsa-evaluation-overexposure-risk-icon-high.svg
diff --git a/html/images/misc/additives-efsa-evaluation-overexposure-risk-icon-moderate.svg b/html/images/misc/additives-efsa-evaluation-overexposure-risk-icon-moderate.svg
diff --git a/lib/ProductOpener/Config_obf.pm b/lib/ProductOpener/Config_obf.pm
@@ -275,33 +275,33 @@ $options{other_servers} = {
 obf =>
 {
 	name => "Open Beauty Facts",
-	data_root => "/home/obf",
-	www_root => "/home/obf/html",
+	data_root => "/srv/obf",
+	www_root => "/srv/obf/html",
 	mongodb => "obf",
 	domain => "openbeautyfacts.org",
 },
 off =>
 {
 	name => "Open Food Facts",
-	data_root => "/home/off",
-	www_root => "/home/off/html",
+	data_root => "/srv/off",
+	www_root => "/srv/off/html",
 	mongodb => "off",
 	domain => "openfoodfacts.org",
 },
 opff =>
 {
 	prefix => "opff",
 	name => "Open Pet Food Facts",
-	data_root => "/home/opff",
-	www_root => "/home/opff/html",
+	data_root => "/srv/opff",
+	www_root => "/srv/opff/html",
 	mongodb => "opff",
 	domain => "openpetfoodfacts.org",
 },
 opf =>
 {
 	name => "Open Products Facts",
-	data_root => "/home/opf",
-	www_root => "/home/opf/html",
+	data_root => "/srv/opf",
+	www_root => "/srv/opf/html",
 	mongodb => "opf",
 	domain => "openproductsfacts.org",
 },

diff --git a/lib/ProductOpener/Config_off.pm b/lib/ProductOpener/Config_off.pm
@@ -700,36 +700,52 @@ $options{other_servers} = {
 obf =>
 {
 	name => "Open Beauty Facts",
-	data_root => "/home/obf",
-	www_root => "/home/obf/html",
+	data_root => "/srv/obf",
+	www_root => "/srv/obf/html",
 	mongodb => "obf",
 	domain => "openbeautyfacts.org",
 },
 off =>
 {
 	name => "Open Food Facts",
-	data_root => "/home/off",
-	www_root => "/home/off/html",
+	data_root => "/srv/off",
+	www_root => "/srv/off/html",
 	mongodb => "off",
 	domain => "openfoodfacts.org",
 },
 opf =>
 {
 	name => "Open Products Facts",
-	data_root => "/home/opf",
-	www_root => "/home/opf/html",
+	data_root => "/srv/opf",
+	www_root => "/srv/opf/html",
 	mongodb => "opf",
 	domain => "openproductsfacts.org",
 },
 opff =>
 {
 	prefix => "opff",
 	name => "Open Pet Food Facts",
-	data_root => "/home/opff",
-	www_root => "/home/opff/html",
+	data_root => "/srv/opff",
+	www_root => "/srv/opff/html",
 	mongodb => "opff",
 	domain => "openpetfoodfacts.org",
 }
 };
 
+
+$options{display_tag_additives} = [
+
+	'@additives_classes',
+	'wikipedia',
+	'title:efsa_evaluation_overexposure_risk_title',
+	'efsa_evaluation',
+	'efsa_evaluation_overexposure_risk',	
+	'efsa_evaluation_exposure_table',
+#	'@efsa_evaluation_exposure_mean_greater_than_noael',
+#	'@efsa_evaluation_exposure_95th_greater_than_noael',
+#	'@efsa_evaluation_exposure_mean_greater_than_adi',
+#	'@efsa_evaluation_exposure_95th_greater_than_adi',
+
+];
+
 1;