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

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 8d8b48b..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 1 --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);
 		}