X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=151824cdec7a8a77db75f0b6b1c0c1055a0da2fa;hp=f8a697ac902df640c63bb7b7cd026169014014a6;hb=59824f48d09192d1c535adecf5ee2e4ee2ed47d5;hpb=0e1bb2af9a73112c989d90a9009d20bbe9b3a9d0

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index f8a697a..151824c 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -59,7 +59,7 @@ my @islandids;
 
 my $destspec;
 
-my $maxmaxdist=35;
+my @maxmaxdist= qw(100 100 100);
 my $maxcpu=90;
 my $concur_lim=5;
 
@@ -73,6 +73,9 @@ my $maxcountea=15;
 <div class="query">
 <h1>Find most profitable routes and trades</h1>
 
+% my $searchtype= $ARGS{RouteSearchType};
+% my $searchtype_show;
+%
 % if ($qa->{Dropdowns}) {
 This feature is not available from the "drop down menus" interface.
 % } else {
@@ -86,12 +89,14 @@ This feature is not available from the "drop down menus" interface.
 	islandids_r => \@islandids, archipelagoes_r => undef
  &>
 
-% my $searchtype= $ARGS{RouteSearchType};
 % if ($searchtype == 0) {
 %	$destspec= 'any';
+%	$searchtype_show= 'open-ended';
 % } elsif ($searchtype == 1) {
 %	$destspec= 'circ';
+%	$searchtype_show= 'circular';
 % } elsif ($searchtype == 2) {
+%	$searchtype_show= 'specific-destination';
 
 Destination (one island only):
 <& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
@@ -123,7 +128,7 @@ print STDERR "ONRESULTS @_\n";
 </&>
 
 <input type=submit name=submit value="Search">
-% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
+% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
 <& "lookup:formhidden", ours => $ours &>
 
 % }
@@ -133,9 +138,11 @@ print STDERR "ONRESULTS @_\n";
 <div class="results">
 <%perl>
 
+my $maxmaxdist= $maxmaxdist[$searchtype];
 if (!$emsg && $maxdist > $maxmaxdist) {
-	$emsg= "Searching for routes of more than $maxmaxdist leagues is not".
-		" supported, sorry.";
+	$emsg= "Searching for $searchtype_show routes".
+               " of more than $maxmaxdist leagues is not".
+	       " supported, sorry.";
 }
 
 print("</div>"), return
@@ -174,7 +181,7 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 }
 push @rsargs, defined $routeparams->{LossPerLeaguePct}
 	? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, 0; #$routeparams->{MinProfit};
+push @rsargs, $routeparams->{MinProfit} // 0;
 push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
 push @rsargs, $destspec;
 push @rsargs, @islandids;
@@ -221,7 +228,7 @@ while (<$fh>) {
 	}
 	die unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
 	my ($ap,$isles) = (uc $1,$5);
-	next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
+	next if $results{$ap} && keys %{$results{$ap}} >= $maxcountea;
 	my $item= { A => $3, P => $4, Leagues => $2 };
 	my (@i, @fi, @a);
 	foreach (split / /, $isles) {
@@ -258,7 +265,7 @@ if (!close $fh) {
 	die $! if $!;
 	die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
 </%perl>
-<h2>Search took too long and was terminated</h2>
+% $someresults->('Search took too long and was terminated');
 
 Sorry, but your query resulted in a search that took too long.
 Searches are limited to <% $maxcpu |h %> seconds of CPU time to
@@ -266,16 +273,17 @@ avoid them consuming excessive resources on the server system, and to
 make sure that shorter searches can still happen.
 
 <p>
-Please try a search with a smaller minimum distance, or place more
+Please try a search with a smaller maximum distance, or place more
 restrictions on the route.
 
+</div>
 <%perl>
 	return;
 }
 
 if ($concur_fail) {
 </%perl>
-<h2>Server too busy</h2>
+% $someresults->('Server too busy');
 
 Sorry, but there are already <% $concur_lim |h %> route searches
 running.  We limit the number which can run at once to avoid
@@ -292,6 +300,7 @@ avoid asking for large searches that you're not sure about.
 Otherwise, please try later.  Searches are limited to <% $maxcpu |h %>
 seconds of CPU time so more processing resources should be available soon.
 
+</div>
 <%perl>
 	return;
 }