X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=9c583b8899338489228249fef319dc360e7d3883;hb=ad29b01fe6470a4b3bb108a8f485657927175e24;hp=36e6055b898610a3ccb2910e641203f9923bbddd;hpb=fbe374c3592808f9b3f105ec0726b26ada6c0ea0;p=ypp-sc-tools.web-live.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 36e6055..9c583b8 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>
@@ -63,12 +67,15 @@ my $maxcountea=15;
%perl>
+
Find most profitable routes and trades
% if ($qa->{Dropdowns}) {
This feature is not available from the "drop down menus" interface.
% } else {
+% $prselector->('RouteSearchType');
+
+
+
<%perl>
if (!$emsg && $maxdist > $maxmaxdist) {
@@ -103,9 +112,12 @@ if (!$emsg && $maxdist > $maxmaxdist) {
" 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 $routeparams->{MaxMass} or
+ defined $routeparams->{MaxVolume});
#---------- prepare island names ----------
@@ -136,7 +148,9 @@ 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, 'search',$maxdist, $maxcountea,$maxcountea;
+push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
+push @rsargs, @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
@@ -198,10 +212,13 @@ 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);
+ $item->{ArchesString}= join ', ', @a;
+ $item->{ViasString}= join ' ', map { $_.',' } @{ $item->{Vias} };
+ $item->{RouteSortString}= join ', ', @i;
$results{$ap}{$isles}= $item;
}
@@ -252,6 +269,8 @@ seconds of CPU time so more processing resources should be available soon.
return;
}
+$someresults->();
+
%perl>
% foreach my $ap (qw(A P)) {
% if ($ap eq 'A') {
@@ -259,44 +278,66 @@ seconds of CPU time so more processing resources should be available soon.
% } else {
Best routes for profit per league
% }
-
+
-
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};
- |
---|
+% 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 %>
- | <% join ', ', @{ $item->{Archs} } |h %>
+ | <%
+ $item->{ArchesString} |h %>
| <% $item->{Start} |h %>,
- | <% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
+ | <% $item->{ViasString} |h %>
| <% $item->{Finish} |h %>
|
% $datarow ^= 1;
% } # $isles
+<&| 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) %>;
+&tabsort>
% } # $ap
@@ -308,7 +349,4 @@ Per league values count each island visited as one
to be sailed. All profit figures are somewhat approximate; get a
complete trading plan for a route for accurate information.
-<%perl>
-
-
-%perl>
+