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=65f57f881531797d36bd7df6f1b39c3db331fce2;hp=6f051351ca2f981bf677f2bd2fa4394f78a81459;hb=4a64ff96caa3eddb15ed84e09b6b5c8b7d614fc8;hpb=8fb8cf52d2bf96beda40c30134e04a352ff988b4 diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 6f05135..65f57f8 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -36,13 +36,16 @@ <%args> $quri $dbh +$queryqf $islandstring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; $distance => ''; +$prselector $someresults $emsgokorprint +$allargs %args> <%perl> @@ -52,11 +55,14 @@ 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=10; -my $maxcpu=10; +my $maxcountea=15; %perl> @@ -66,6 +72,8 @@ my $maxcpu=10; This feature is not available from the "drop down menus" interface. % } else { +% $prselector->('RouteSearchType'); +
<%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; +$allargs->{'submit'} or return; defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return; #---------- prepare island names ---------- @@ -118,12 +127,13 @@ my $isleinfo = sub { my $row= $islandname_stmt->fetchrow_hashref(); local $_= $row->{'islandname'}; s/ Island$//; - return $_, $row->{'archipelago'}; + return $_, $row->{'islandname'}, $row->{'archipelago'}; }; #---------- compute the results ---------- -my @rsargs= qw(-DN); +my @rsargs= ($concur_lim, '-DN'); +my $concur_fail; foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { my $v= $routeparams->{$k}; @@ -131,7 +141,10 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { } push @rsargs, defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9; -push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, '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; @@ -141,8 +154,13 @@ if ($qa->{'debug'}) { <%perl> } -unshift @rsargs, sourcebasedir().'/yarrg/routesearch', - '-d', dbw_filename($qa->{'Ocean'}); +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 } @@ -151,7 +169,7 @@ 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 $soft>$maxcpu; + setrlimit($cpu,$maxcpu,$hard) or die $! if $hard<=$maxcpu; exec @rsargs; die $!; } @@ -163,15 +181,20 @@ 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 (@i, @a); + my $item= { A => $3, P => $4, Leagues => $2 }; + my (@i, @fi, @a); foreach (split / /, $isles) { - my ($name,$arch)= $isleinfo->($_); + my ($name,$fullname,$arch)= $isleinfo->($_); push @i, $name; + push @fi, $fullname; push @a, $arch unless @a && $a[-1] eq $arch; } $item->{Isles}= [ @i ]; @@ -183,6 +206,13 @@ while (<$fh>) { 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; } @@ -190,44 +220,130 @@ 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)) { -
Profit + | Dist. | Archipelagoes - | Route + | + | 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}; - | |||||||||
<% $item->{A} |h %> | <% $item->{P} |h %> - | <% join ', ', @{ $item->{Archs} } |h %> + | <% $item->{Leagues} |h %> + | <% + $item->{ArchesString} |h %> | <% $item->{Start} |h %>, - | <% join ' ', map { $_.',' } @{ $item->{Vias} } |h %> + | <% $item->{ViasString} |h %> | <% $item->{Finish} |h %> | % $datarow ^= 1; % } # $isles
+ +