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%2Fquery_routesearch;h=357ba94ed39395e86d230801cef31fa53a9ef26d;hp=9accc54bbf2dbf31987948bc2e8e2606457f2ba9;hb=53dfe71f6c510ee12bbf6bdaeb3984024d34a7be;hpb=2abd3537af0c697684bfb97895f230372101329d

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 9accc54..357ba94 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -36,13 +36,17 @@
 <%args>
 $quri
 $dbh
+$baseqf
+$queryqf
 $islandstring => '';
 $capacitystring => '';
 $lossperleague => '';
 $capitalstring => '';
 $distance => '';
+$prselector
 $someresults
 $emsgokorprint
+$allargs
 </%args>
 
 <%perl>
@@ -52,18 +56,26 @@ my $emsg;
 my @warningfs;
 my @islandids;
 
+my $maxmaxdist=35;
+my $maxcpu=90;
+my $concur_lim=5;
+
 my $qa= \%ARGS;
 my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 };
 my $maxdist;
+my $maxcountea=15;
 
 </%perl>
 
+<div class="query">
 <h1>Find most profitable routes and trades</h1>
 
 % if ($qa->{Dropdowns}) {
 This feature is not available from the "drop down menus" interface.
 % } else {
 
+% $prselector->('RouteSearchType');
+
 <form action="<% $quri->() |h %>" method="get">
 
 <& enter_route, qa=>$qa, dbh=>$dbh, emsg_r=>\$emsg, warningfs_r=>\@warningfs,
@@ -84,27 +96,50 @@ This feature is not available from the "drop down menus" interface.
  </&>
 </&>
 
-<input type=submit name=submit value="Go">
+<input type=submit name=submit value="Search">
 % my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; };
 <& "lookup:formhidden", ours => $ours &>
 
 % }
 
 </form>
+</div>
+<div class="results">
 <%perl>
 
-if (!$emsg && $maxdist > 30) {
-	$emsg= "Searching for routes of more than 30 leagues is not".
+if (!$emsg && $maxdist > $maxmaxdist) {
+	$emsg= "Searching for routes of more than $maxmaxdist leagues is not".
 		" supported, sorry.";
 }
 
-$emsgokorprint->($emsg) or return;
-@islandids or return;
-defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return;
+print("</div>"), return
+     unless $emsgokorprint->($emsg)
+	and @islandids
+	and $allargs->{'submit'}
+	and (defined $routeparams->{MaxMass} or
+	     defined $routeparams->{MaxVolume});
+
+#---------- prepare island names ----------
+
+my $islandname_stmt= $dbh->prepare(<<END);
+	SELECT islandname, archipelago
+	  FROM islands
+	 WHERE islandid = ?
+END
+
+my $isleinfo = sub {
+	my ($id) = @_;
+	$islandname_stmt->execute($id);
+	my $row= $islandname_stmt->fetchrow_hashref();
+	local $_= $row->{'islandname'};
+	s/ Island$//;
+	return $_, $row->{'islandname'}, $row->{'archipelago'};
+};
 
 #---------- compute the results ----------
 
-my @rsargs;
+my @rsargs= ($concur_lim, '-DN');
+my $concur_fail;
 
 foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 	my $v= $routeparams->{$k};
@@ -112,28 +147,35 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 }
 push @rsargs, defined $routeparams->{LossPerLeaguePct}
 	? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, qw(search 10 10), $maxdist, 'any', @islandids;
+push @rsargs, '0';
+push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
+push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
+push @rsargs, @islandids;
 
 m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
 
-unshift @rsargs, dbw_filename($qa->{'Ocean'});
-unshift @rsargs, qw(-DN);
-
 if ($qa->{'debug'}) {
 </%perl>
 [[ <% "@rsargs" |h %> ]]<br><pre>
 <%perl>
 }
 
-unshift @rsargs, sourcebasedir().'/yarrg/routesearch';
+unshift @rsargs,
+	'nice', sourcebasedir().'/yarrg/routesearch',
+	'-d', dbw_filename($qa->{'Ocean'}),
+	'-C', webdatadir().'/_concur.', '.lock';
+
+# touch _concur.0{0,1,2,3,4}.lock
+# really chgrp www-data _concur.0?.lock
+
+my %results; # $results{$ap}{"5 6 9 10"} = { stuff }
 
 my $fh= new IO::File;
 my $child= $fh->open("-|"); defined $child or die $!;
 if (!$child) {
 	my $cpu= BSD::Resource::RLIMIT_CPU;
 	my ($soft,$hard)= getrlimit($cpu);
-	my $max=10;
-	setrlimit($cpu,$max,$hard) or die $! if $soft>$max;
+	setrlimit($cpu,$maxcpu,$hard) or die $! if $hard<=$maxcpu;
 	exec @rsargs;
 	die $!;
 }
@@ -145,10 +187,166 @@ while (<$fh>) {
 <% $_ |h %>
 <%perl>
 	}
+	next unless m/^\s*\@/;
+	if (m/^\@\@\@ concurrency limit exceeded/) {
+		$concur_fail= 1;
+		last;
+	}
+	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;
+	my $item= { A => $3, P => $4, Leagues => $2 };
+	my (@i, @fi, @a);
+	foreach (split / /, $isles) {
+		my ($name,$fullname,$arch)= $isleinfo->($_);
+		push @i, $name;
+		push @fi, $fullname;
+		push @a, $arch unless @a && $a[-1] eq $arch;
+	}
+	$item->{Isles}= [ @i ];
+	$item->{Archs}= [ @a ];
+	$item->{Start}= $i[0];
+	$item->{Finish}= $i[-1];
+	$item->{Vias}= [ ];
+	my $i;
+	for ($i=1; $i < @i-1; $i++) {
+		push @{ $item->{Vias} }, $i[$i];
+	}
+	my %linkqf= (%$baseqf, %$queryqf);
+	delete $linkqf{'query'};
+	$linkqf{'routestring'}= join ', ', @fi;
+	$item->{Url}= $quri->(%linkqf);
+	$item->{ArchesString}= join ', ', @a;
+	$item->{ViasString}= join ' ', map { $_.',' } @{ $item->{Vias} };
+	$item->{RouteSortString}= join ', ', @i;
+	$results{$ap}{$isles}= $item;
 }
 
 if ($qa->{'debug'}) {
 	print "</pre>\n";
 }
 
+$!=0;
+if (!close $fh) {
+	die $! if $!;
+	die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
+</%perl>
+<h2>Search took too long and was terminated</h2>
+
+Sorry, but your query resulted in a search that took too long.
+Searches are limited to <% $maxcpu |h %> seconds of CPU time to
+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
+restrictions on the route.
+
+<%perl>
+	return;
+}
+
+if ($concur_fail) {
+</%perl>
+<h2>Server too busy</h2>
+
+Sorry, but there are already <% $concur_lim |h %> route searches
+running.  We limit the number which can run at once to avoid
+overloading the server system and to make sure that the rest of the
+YARRG website still runs quickly.
+<p>
+
+If you submitted several searches and gave up on them (eg by hitting
+"back" or "stop" in your browser), be aware that that doesn't
+generally stop the search process at the server end.  So it's best to
+avoid asking for large searches that you're not sure about.
+
+<p>
+Otherwise, please try later.  Searches are limited to <% $maxcpu |h %>
+seconds of CPU time so more processing resources should be available soon.
+
+<%perl>
+	return;
+}
+
+$someresults->();
+
 </%perl>
+% foreach my $ap (qw(A P)) {
+%	if ($ap eq 'A') {
+<h2>Best routes for total profit</h2>
+%	} else {
+<h2>Best routes for profit per league</h2>
+%	}
+<table class="data" rules=groups id="ap<% $ap %>_table">
+<colgroup span=2>
+<colgroup span=1>
+<colgroup span=1>
+<colgroup span=3>
+<tr>
+<th colspan=2>Profit
+<th>Dist.
+<th>Archipelagoes
+<th>
+<th>Route
+<th>
+<tr>
+<th>Abs.
+<th>Per.lg.
+<th>
+<th>(link to plan)
+<th>Start
+<th>Via
+<th>Finish
+<tr id="ap<% $ap %>_sortrow"><th><th><th><th><th><th><th>
+%	my $datarow=0;
+%	my %sortkeys;
+%	foreach my $isles (sort {
+%			$results{$ap}{$b}{$ap} <=>
+%			$results{$ap}{$a}{$ap}
+%		} keys %{$results{$ap}}) {
+%		my $item= $results{$ap}{$isles};
+%		my $ci=0;
+%		my $rowid= "r${ap}$isles"; $rowid =~ y/ /_/;
+%		foreach my $k (qw(A P Leagues ArchesString
+%			          Start RouteSortString Finish)) {
+%			$sortkeys{$ci}{$rowid}= $item->{$k};
+%			$ci++;
+%		}
+<tr class="datarow<% $datarow %>" id="<% $rowid %>">
+<td align=right><% $item->{A} |h %>
+<td align=right><% $item->{P} |h %>
+<td align=right><% $item->{Leagues} |h %>
+<td align=left><a href="<% $item->{Url} |h %>"><%
+		  $item->{ArchesString} |h %></a>
+<td align=left><% $item->{Start} |h %>,
+<td align=left><% $item->{ViasString} |h %>
+<td align=left><% $item->{Finish} |h %>
+</td>
+%		$datarow ^= 1;
+%	} # $isles
+</table>
+<&| tabsort,	table => "ap${ap}_table", sortkeys => "ap${ap}_sortkeys",
+		throw => "ap${ap}_sortrow", rowclass => "datarow", cols => [
+		{ DoReverse => 1, Numeric => 1 },
+		{ DoReverse => 1, Numeric => 1 },
+		{ DoReverse => 1, Numeric => 1 },
+		{ },
+		{ },
+		{ },
+		{ },
+	] &>
+  ap<% $ap %>_sortkeys= <% to_json_protecttags(\%sortkeys) %>;
+</&tabsort>
+% } # $ap
+
+<p>
+
+<h2>Notes</h2>
+
+Per league values count each island visited as one
+(additional) league; the "Dist." column is however the actual distance
+to be sailed.  All profit figures are somewhat approximate; get a
+complete trading plan for a route for accurate information.
+
+</div>