X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=dc8c230c54767b3b5310004eed0d6b48c495d4db;hb=9101afe763ab49064b0ac3b5ab5ea066bcbc6259;hp=bbeba5b522e59ce506ec29d9fb334fa01ae93334;hpb=f2f25e1201a92e62c3eeb35cdec0a62539e18cb5;p=ypp-sc-tools.main.git diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index bbeba5b..dc8c230 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -46,13 +46,20 @@ $emsgokorprint %args> <%perl> +use BSD::Resource; + my $emsg; my @warningfs; my @islandids; +my $maxmaxdist=35; +my $maxcpu=90; +my $concur_lim=5; + my $qa= \%ARGS; -my $routeparams= { EmsgRef => \$emsg, SayOptionalCapital => 1 }; +my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 }; my $maxdist; +my $maxcountea=15; %perl> @@ -70,11 +77,15 @@ This feature is not available from the "drop down menus" interface. &> <&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &> +
+<%perl> +} + +unshift @rsargs, + 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); + setrlimit($cpu,$maxcpu,$hard) or die $! if $hard<=$maxcpu; + exec @rsargs; + die $!; +} + +while (<$fh>) { + chomp; + if ($qa->{'debug'}) { +%perl> +<% $_ |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, @a); + foreach (split / /, $isles) { + my ($name,$arch)= $isleinfo->($_); + push @i, $name; + 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]; + } + $results{$ap}{$isles}= $item; +} + +if ($qa->{'debug'}) { + print "\n"; +} + +$!=0; +if (!close $fh) { + die $! if $!; + die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/ +%perl> +
+Please try a search with a smaller minimum distance, or place more +restrictions on the route. + +<%perl> + return; +} + +if ($concur_fail) { +%perl> +
+ +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; +} + +%perl> +% foreach my $ap (qw(A P)) { +
Profit + | Dist. + | Archipelagoes + | Route + | |||
---|---|---|---|---|---|---|
Abs. + | Per.lg. + | + | + | Start + | Via + | Finish + |
<% $item->{A} |h %> + | <% $item->{P} |h %> + | <% $item->{Leagues} |h %> + | <% join ', ', @{ $item->{Archs} } |h %> + | <% $item->{Start} |h %>, + | <% join ' ', map { $_.',' } @{ $item->{Vias} } |h %> + | <% $item->{Finish} |h %> + | +% $datarow ^= 1; +% } # $isles +