routesearch: parse output in query_routesearch

[ypp-sc-tools.main.git] / yarrg / web / query_routesearch

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 9accc54bbf2dbf31987948bc2e8e2606457f2ba9..af18d36193c5a7f16ad05e38ce7a275421de566e 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -55,6 +55,7 @@ my @islandids;
 my $qa= \%ARGS;
 my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 };
 my $maxdist;
+my $maxcountea=10;
 
 </%perl>
 
@@ -112,7 +113,7 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 }
 push @rsargs, defined $routeparams->{LossPerLeaguePct}
        ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, qw(search 10 10), $maxdist, 'any', @islandids;
+push @rsargs, 'search', $maxcountea,$maxcountea, $maxdist, 'any', @islandids;
 
 m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
 
@@ -127,6 +128,8 @@ if ($qa->{'debug'}) {
 
 unshift @rsargs, sourcebasedir().'/yarrg/routesearch';
 
+my %results; # $results{$ap}{"5 6 9 10"} = { stuff }
+
 my $fh= new IO::File;
 my $child= $fh->open("-|"); defined $child or die $!;
 if (!$child) {
@@ -145,10 +148,37 @@ while (<$fh>) {
 <% $_ |h %>
 <%perl>
        }
+       next unless
+  m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
+       my ($ap,$isles) = (uc $1,$4);
+       next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
+       my $item= { A => $2, P => $3 };
+#      my @isles= map { @islenames[$_] }, split / /, @isles;
+       $results{$ap}{$isles}= $item;
 }
 
 if ($qa->{'debug'}) {
        print "</pre>\n";
 }
 
+</%perl>
+% foreach my $ap (qw(A P)) {
+<h2>ap=<% $ap %></h2>
+<table rules=all>
+%      foreach my $isles (sort {
+%                      $results{$ap}{$a}{Values}{$ap} <=>
+%                      $results{$ap}{$b}{Values}{$ap}
+%              } keys %{$results{$ap}}) {
+%              my $item= $results{$ap}{$isles};
+<tr>
+<td align=right><% $item->{A} |h %>
+<td align=right><% $item->{P} |h %>
+<td align=center><% $isles |h %>
+</td>
+%      } # $isles
+</table>
+% } # $ap
+<%perl>
+
+
 </%perl>