Merge branch 'stable-5.x' into web

diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver
index 123ca0cd7acc0c3778555ff786aa843881232dd0..2059ad792416710584c279eb1d2de63032220339 100755 (executable)
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@ -129,7 +129,7 @@ foreach my $islands (values %$arches) {
 fail("unknown island ".errsan($o{'island'})) unless $island_found;
 
 $o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
-fail("clock skew") if $o{'timestamp'} >= $now;
+fail("clock skew") if $o{'timestamp'} > $now;
 
 my $indatafh= upload('data');
 defined $indatafh or fail("data is not a file");

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index ce319facae713bb9e32edddf86a1509d979b4772..b198b9b3867ab7cff6ca4fb2150f2b33d037c921 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -546,7 +546,7 @@ if ($qa->{'debug'}) {
                my ($varname, $qty) = m/^
                        \s* \d+ \s+
                        (\w+) \s+ (?: [A-Z*]+ \s+ )?
-                       ([0-9.]+) \s
+                       ([+-e0-9.]+) \s
                        /x or die "$cplex \n==\n $glpsol_out $_ ?";
                if ($varname =~ m/^f(\d+)s(\d+)_/) {
                        my ($ix,$orgix) = ($1,$2);