X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fweb%2Fquery_routesearch;h=357ba94ed39395e86d230801cef31fa53a9ef26d;hb=d5b83c4ad6c572a578d1a3be1af21c7bf8e679cd;hp=9accc54bbf2dbf31987948bc2e8e2606457f2ba9;hpb=2abd3537af0c697684bfb97895f230372101329d;p=ypp-sc-tools.db-live.git 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> +
<%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 "\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; +} + +$someresults->(); + %perl> +% foreach my $ap (qw(A P)) { +% if ($ap eq 'A') { +
Profit + | Dist. + | Archipelagoes + | + | Route + | + | |
---|---|---|---|---|---|---|
Abs. + | Per.lg. + | + | (link to plan) + | Start + | Via + | Finish + |
+% 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++; +% } + | ||||||
<% $item->{A} |h %> + | <% $item->{P} |h %> + | <% $item->{Leagues} |h %> + | <% + $item->{ArchesString} |h %> + | <% $item->{Start} |h %>, + | <% $item->{ViasString} |h %> + | <% $item->{Finish} |h %> + | +% $datarow ^= 1; +% } # $isles +
+ +