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=65f57f881531797d36bd7df6f1b39c3db331fce2;hb=27c23298aea5653ffba93b5a9c41bfa321b478d7;hpb=6302552bfa5844eddb7c26386c9995733f0a5174 diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 65f57f8..6cf098e 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -36,11 +36,13 @@ <%args> $quri $dbh +$baseqf $queryqf $islandstring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; +$minprofitstring => ''; $distance => ''; $prselector $someresults @@ -55,7 +57,9 @@ my $emsg; my @warningfs; my @islandids; -my $maxmaxdist=35; +my $destspec; + +my @maxmaxdist= qw(35 35 60); my $maxcpu=90; my $concur_lim=5; @@ -66,8 +70,12 @@ 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 { @@ -81,37 +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; -$allargs->{'submit'} 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 ---------- @@ -141,9 +181,9 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { } push @rsargs, defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9; -push @rsargs, '0'; +push @rsargs, $routeparams->{MinProfit}; push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea; -push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any'; +push @rsargs, $destspec; push @rsargs, @islandids; m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs; @@ -206,7 +246,7 @@ while (<$fh>) { for ($i=1; $i < @i-1; $i++) { push @{ $item->{Vias} }, $i[$i]; } - my %linkqf= %$queryqf; + my %linkqf= (%$baseqf, %$queryqf); delete $linkqf{'query'}; $linkqf{'routestring'}= join ', ', @fi; $item->{Url}= $quri->(%linkqf); @@ -225,7 +265,7 @@ if (!close $fh) { die $! if $!; die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/ -

Search took too long and was terminated

+% $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 @@ -233,16 +273,17 @@ 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 minimum distance, or place more +Please try a search with a smaller maximum distance, or place more restrictions on the route. + <%perl> return; } if ($concur_fail) { -

Server too busy

+% $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 @@ -251,7 +292,7 @@ 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 +"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. @@ -259,6 +300,7 @@ 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; } @@ -272,7 +314,7 @@ $someresults->(); % } else {

Best routes for profit per league

% } - +
@@ -292,7 +334,6 @@ $someresults->();
Start Via Finish -
% my $datarow=0; % my %sortkeys; @@ -340,11 +381,8 @@ $someresults->();

Notes

Per league values count each island visited as one -(additional) league; the `Dist.' column is however the actual distance +(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. -<%perl> - - - +