<%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 }
@@ -135,8 +169,7 @@ 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 $!;
}
@@ -148,12 +181,38 @@ while (<$fh>) {
<% $_ |h %>
<%perl>
}
- next unless
- m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
- my ($ap,$isles) = (uc $1,$4);
+ 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 => $2, P => $3 };
-# my @isles= map { @islenames[$_] }, split / /, @isles;
+ 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= %$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;
}
@@ -161,23 +220,130 @@ if ($qa->{'debug'}) {
print "\n";
}
+$!=0;
+if (!close $fh) {
+ die $! if $!;
+ die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
+
++Please try a search with a smaller minimum distance, or place more +restrictions on the route. + +<%perl> + return; +} + +if ($concur_fail) { + +
+ +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. + +
+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->(); + % foreach my $ap (qw(A P)) { -
| Profit + | Dist. + | Archipelagoes + | + | Route + | + | ||
|---|---|---|---|---|---|---|---|
| Abs. + | Per.lg. + | + | (link to plan) + | Start + | Via + | Finish + | |
| +% my $datarow=0; +% my %sortkeys; % foreach my $isles (sort { -% $results{$ap}{$a}{Values}{$ap} <=> -% $results{$ap}{$b}{Values}{$ap} +% $results{$ap}{$b}{$ap} <=> +% $results{$ap}{$a}{$ap} % } keys %{$results{$ap}}) { % my $item= $results{$ap}{$isles}; - | |||||||
| <% $item->{A} |h %> | <% $item->{P} |h %> - | <% $isles |h %> + | <% $item->{Leagues} |h %> + | <% + $item->{ArchesString} |h %> + | <% $item->{Start} |h %>, + | <% $item->{ViasString} |h %> + | <% $item->{Finish} |h %> | +% $datarow ^= 1; % } # $isles
+ +