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=6cf098ed82c63c8cfce1fe93fe6e889460415675;hp=b9b734806968750d406d0f52eb4a5735e3ecbc1b;hb=27c23298aea5653ffba93b5a9c41bfa321b478d7;hpb=30375dc1932be83a48fca8122e81b845c4b0ecc2 diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index b9b7348..6cf098e 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -36,13 +36,18 @@ <%args> $quri $dbh +$baseqf +$queryqf $islandstring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; +$minprofitstring => ''; $distance => ''; +$prselector $someresults $emsgokorprint +$allargs <%perl> @@ -52,8 +57,11 @@ my $emsg; my @warningfs; my @islandids; -my $maxmaxdist=35; +my $destspec; + +my @maxmaxdist= qw(35 35 60); my $maxcpu=90; +my $concur_lim=5; my $qa= \%ARGS; my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 }; @@ -62,12 +70,18 @@ my $maxcountea=15; +

Find most profitable routes and trades

+% my $searchtype= $ARGS{RouteSearchType}; +% my $searchtype_show; +% % if ($qa->{Dropdowns}) { This feature is not available from the "drop down menus" interface. % } else { +% $prselector->('RouteSearchType'); +
<& enter_route, qa=>$qa, dbh=>$dbh, emsg_r=>\$emsg, warningfs_r=>\@warningfs, @@ -75,36 +89,69 @@ This feature is not available from the "drop down menus" interface. islandids_r => \@islandids, archipelagoes_r => undef &> +% if ($searchtype == 0) { +% $destspec= 'any'; +% $searchtype_show= 'open-ended'; +% } elsif ($searchtype == 1) { +% $destspec= 'circ'; +% $searchtype_show= 'circular'; +% } elsif ($searchtype == 2) { +% $searchtype_show= 'specific-destination'; + +Destination (one island only): +<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg, + thingstring => 'deststring', + prefix => 'ds', boxopts => 'size=40', + onresults => sub { +print STDERR "ONRESULTS @_\n"; + return unless @_; + my ($canonname, $island, $arch) = @{ $_[0] }; + die unless defined $island; + $destspec= $island; + } + &> + +% } else { +% die "$destspec ?"; +% } + <&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>     Maximum distance: - <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml', - thingstring => 'distance', emsgstore => \$emsg, - onresults => sub { ($maxdist)= @_; } &> - size=10 - + <& qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml', + thingstring => 'distance', emsgstore => \$emsg, boxopts => 'size=10', + onresults => sub { ($maxdist)= @_; } + &> - -% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; }; + +% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; }; <& "lookup:formhidden", ours => $ours &> % }
+
+
<%perl> +my $maxmaxdist= $maxmaxdist[$searchtype]; if (!$emsg && $maxdist > $maxmaxdist) { - $emsg= "Searching for routes of more than $maxmaxdist leagues is not". - " supported, sorry."; + $emsg= "Searching for $searchtype_show 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("
"), return + unless $emsgokorprint->($emsg) + and @islandids + and $allargs->{'submit'} + and defined $destspec + and (defined $routeparams->{MaxMass} or + defined $routeparams->{MaxVolume}); #---------- prepare island names ---------- @@ -120,12 +167,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}; @@ -133,8 +181,10 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { } push @rsargs, defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9; -push @rsargs, '0'; -push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids; +push @rsargs, $routeparams->{MinProfit}; +push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea; +push @rsargs, $destspec; +push @rsargs, @islandids; m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs; @@ -144,8 +194,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 } @@ -166,14 +221,20 @@ while (<$fh>) { <% $_ |h %> <%perl> } - next unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/; + 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); + 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 ]; @@ -185,6 +246,13 @@ while (<$fh>) { 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; } @@ -192,48 +260,129 @@ if ($qa->{'debug'}) { print "\n"; } +$!=0; +if (!close $fh) { + die $! if $!; + die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/ + +% $someresults->('Search took too long and was terminated'); + +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. + +

+Please try a search with a smaller maximum distance, or place more +restrictions on the route. + + +<%perl> + return; +} + +if ($concur_fail) { + +% $someresults->('Server too busy'); + +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. +

+ +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)) { -

ap=<% $ap %>

- +% if ($ap eq 'A') { +

Best routes for total profit

+% } else { +

Best routes for profit per league

+% } +
+- + +% 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++; +% } + % $datarow ^= 1; % } # $isles
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 %> <% $item->{Leagues} |h %> -<% join ', ', @{ $item->{Archs} } |h %> +<% + $item->{ArchesString} |h %> <% $item->{Start} |h %>, -<% join ' ', map { $_.',' } @{ $item->{Vias} } |h %> +<% $item->{ViasString} |h %> <% $item->{Finish} |h %>
+<&| 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) %>; + % } # $ap -<%perl> +

- +

Notes

+ +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. + +