X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=fadc20ed8db5d0b5b12e6942ba09742c9fa3854b;hb=cb6af6f4bf6b6c3f7852912ebec58e773a724a5a;hp=36e6055b898610a3ccb2910e641203f9923bbddd;hpb=fbe374c3592808f9b3f105ec0726b26ada6c0ea0;p=ypp-sc-tools.main.git diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 36e6055..fadc20e 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -42,6 +42,7 @@ $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; $distance => ''; +$someresults $emsgokorprint %args> @@ -89,7 +90,7 @@ This feature is not available from the "drop down menus" interface. &> &> - + % my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; }; <& "lookup:formhidden", ours => $ours &> @@ -202,6 +203,9 @@ while (<$fh>) { 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 +256,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 +265,67 @@ seconds of CPU time so more processing resources should be available soon. % } else {
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 %> | % $datarow ^= 1; % } # $isles