Normalise commodity name case (from uploads)

[ypp-sc-tools.db-test.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index f339caaab029d1282dcbc0488f97ef521218f8e4..c62ca60b7f89a7956008cacc7c8998ae944a72c7 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -586,7 +586,7 @@ my $try_solve= sub {
        my $input= pipethrough_prep();
        print $input $cplex or die $!;
        my $output= pipethrough_run_along($input, undef, 'glpsol',
-               qw(glpsol --tmlim 5 --memlim 5), @opts,
+               qw(glpsol --tmlim 5 --memlim 20), @opts,
                qw( --cpxlp /dev/stdin -o /dev/stdout));
        if ($qa->{'debug'}) {
                print "<h3>@opts</h3>\n<pre>\n";
@@ -918,7 +918,7 @@ END
 <$td align=right>$t->{Total} total
 END
                foreach my $stallix (1..$#stalls) {
-                       tr_datarow_s($m,$dline);
+                       $plan_html .= tr_datarow_s($m,$dline);
                        $pstall->($stallix);
                }
 
@@ -1010,12 +1010,12 @@ END
 <%perl>
        my $sth_i= $dbh->prepare(<<END);
                SELECT archipelago, islandid, islandname, timestamp
-                       FROM uploads NATURAL JOIN islands
+                       FROM uploads JOIN islands USING (islandid)
                        WHERE islandid = ?
 END
        my $sth_a= $dbh->prepare(<<END);
                SELECT archipelago, islandid, islandname, timestamp
-                       FROM uploads NATURAL JOIN islands
+                       FROM uploads JOIN islands USING (islandid)
                        WHERE archipelago = ?
                        ORDER BY islandname
 END