Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…

…ts-server
openfoodfacts · Sep 25, 2018 · 9ffea09 · 9ffea09
2 parents ac9daf0 + f031949
commit 9ffea09
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/cgi/sucres_check.pl b/cgi/sucres_check.pl
@@ -37,7 +37,7 @@
 my $actual = decode utf8=>param('actual');
 my $points = decode utf8=>param('points');
 
-open (my $OUT, ">>" , "/home/sucres/logs/sugar_log");
+open (my $OUT, ">>" , "/srv/sucres/logs/sugar_log");
 print $OUT remote_addr() . "\t" . time() . "\t" . $product . "\t" . $code . "\t" . $actual . "\t" . $answer . "\t" . $points . "\n";
 close $OUT;
 

diff --git a/cgi/sucres_random.pl b/cgi/sucres_random.pl
@@ -34,7 +34,7 @@
 use List::Util qw(shuffle);
 use Log::Any qw($log);
 
-my $ids_ref = lock_retrieve("/home/sucres/data/products_ids.sto");
+my $ids_ref = lock_retrieve("/srv/sucres/data/products_ids.sto");
 my @ids = @$ids_ref;
 
 srand();

diff --git a/cgi/sugar_check.pl b/cgi/sugar_check.pl
@@ -37,7 +37,7 @@
 my $actual = decode utf8=>param('actual');
 my $points = decode utf8=>param('points');
 
-open (my $OUT, ">>" , "/home/sugar/logs/sugar_log");
+open (my $OUT, ">>" , "/srv/sugar/logs/sugar_log");
 print $OUT remote_addr() . "\t" . time() . "\t" . $product . "\t" . $code . "\t" . $actual . "\t" . $answer . "\t" . $points . "\n";
 close $OUT;
 

diff --git a/cgi/sugar_random.pl b/cgi/sugar_random.pl
@@ -34,7 +34,7 @@
 use List::Util qw(shuffle);
 use Log::Any qw($log);
 
-my $ids_ref = lock_retrieve("/home/sugar/data/products_ids.sto");
+my $ids_ref = lock_retrieve("/srv/sugar/data/products_ids.sto");
 my @ids = @$ids_ref;
 
 srand();

diff --git a/scripts/gen_sucres.pl b/scripts/gen_sucres.pl
@@ -190,7 +190,7 @@
 		my $cubes_small = sprintf("%.1f", $sc);
 		my $cubes_big = sprintf("%.1f", $big);
 		my $producturl = product_url($product_ref);
-		$producturl =~ s/^\//http:\/\/fr.openfoodfacts.org\//;
+		$producturl =~ s/^\//https:\/\/fr.openfoodfacts.org\//;
 
 		my $code = $product_ref->{"code"};
 
@@ -243,7 +243,7 @@
 
 		$product_ref->{jqm} = 1;
 		my $img = display_image($product_ref, 'front', 200);
-		$img =~ s/src="\//src="http:\/\/fr.openfoodfacts.org\//;
+		$img =~ s/src="\//src="https:\/\/fr.openfoodfacts.org\//;
 		my $img_url = '';
 		my $zoom = '';
 		if ($img =~ /src="(.*?)"/) {
@@ -482,7 +482,7 @@
 
   (function() {
     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'https://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 
@@ -607,7 +607,7 @@
 HTML
 ;
 
-		open (my $OUT, ">:encoding(UTF-8)", "/home/sucres/html/$id.html");
+		open (my $OUT, ">:encoding(UTF-8)", "/srv/sucres/html/$id.html");
 		print $OUT $page;
 		close $OUT;
 
@@ -624,7 +624,7 @@
 	print $OUT $html;
 	close $OUT;
 
-	store("/home/sucres/data/products_ids.sto", \@ids);
+	store("/srv/sucres/data/products_ids.sto", \@ids);
 
 	print "$k products, $kk products kept\n";
 }

diff --git a/scripts/gen_sugar.pl b/scripts/gen_sugar.pl
@@ -92,7 +92,7 @@
 
 
 
-	my $query_ref = {lc=>$lc, states_tags=>'complete'};
+	my $query_ref = {lc=>$lc, states_tags=>'en:complete'};
 	#$query_ref->{"nutriments.sugars_100g"}{ '$gte'}  = 0.01;
 	# -> does not seem to work for sugars, maybe some string values?!
 
@@ -194,7 +194,7 @@
 		my $cubes_small = sprintf("%.1f", $sc);
 		my $cubes_big = sprintf("%.1f", $big);
 		my $producturl = product_url($product_ref);
-		$producturl =~ s/^\//http:\/\/world.openfoodfacts.org\//;
+		$producturl =~ s/^\//https:\/\/world.openfoodfacts.org\//;
 
 		my $code = $product_ref->{"code"};
 
@@ -247,7 +247,7 @@
 
 		$product_ref->{jqm} = 1;
 		my $img = display_image($product_ref, 'front', 200);
-		$img =~ s/src="\//src="http:\/\/world.openfoodfacts.org\//;
+		$img =~ s/src="\//src="https:\/\/world.openfoodfacts.org\//;
 		my $img_url = '';
 		my $zoom = '';
 		if ($img =~ /src="(.*?)"/) {
@@ -613,7 +613,7 @@
 HTML
 ;
 
-		open (my $OUT, ">:encoding(UTF-8)", "/home/sugar/html/$id.html");
+		open (my $OUT, ">:encoding(UTF-8)", "/srv/sugar/html/$id.html");
 		print $OUT $page;
 		close $OUT;
 
@@ -630,7 +630,7 @@
 	print $OUT $html;
 	close $OUT;
 
-	store("/home/sugar/data/products_ids.sto", \@ids);
+	store("/srv/sugar/data/products_ids.sto", \@ids);
 
 	print "$k products, $kk products kept\n";
 }