X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=03ef3e1e8dc4ab99bfc8b29cfc8b69750268845c;hp=b51a3a06eb4810c7dc920a69a072dbc6d84352b1;hb=ea09579bdbec295cfe7735a262e06055a1f69835;hpb=ca4f2a1a8f85d4dbd1c85250f95c6980d6bf9f3a

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index b51a3a0..03ef3e1 100644
--- 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";
@@ -896,7 +896,7 @@ END
 		$linkqf{'query'}= 'commod';
 		$linkqf{'commodstring'}= $t->{'commodname'};
 		$linkqf{'commodid'}= $t->{'commodid'};
-		my $linkqfpr= $quri->(%linkqf);
+		my $linkqfpr= encode_entities( $quri->(%linkqf) );
 		my $commodnamepr= encode_entities($t->{'commodname'});
 		$plan_html .= tr_datarow_s($m,$dline) . <<END;
 <$td>$collectdeliver
@@ -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);
 		}