routesearch: print results table

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

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index af18d36193c5a7f16ad05e38ce7a275421de566e..34fbc22e38d25584a078afd1caf05b78ed1b7497 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -103,6 +103,23 @@ $emsgokorprint->($emsg) or return;
 @islandids or return;
 defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return;
 
+#---------- prepare island names ----------
+
+my $islandname_stmt= $dbh->prepare(<<END);
+       SELECT islandname, archipelago
+         FROM islands
+        WHERE islandid = ?
+END
+
+my $isleinfo = sub {
+       my ($id) = @_;
+       $islandname_stmt->execute($id);
+       my $row= $islandname_stmt->fetchrow_hashref();
+       local $_= $row->{'islandname'};
+       s/ Island$//;
+       return $_, $row->{'archipelago'};
+};
+
 #---------- compute the results ----------
 
 my @rsargs;
@@ -153,7 +170,21 @@ while (<$fh>) {
        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;
+       my (@i, @a);
+       foreach (split / /, $isles) {
+               my ($name,$arch)= $isleinfo->($_);
+               push @i, $name;
+               push @a, $arch unless @a && $a[-1] eq $arch;
+       }
+       $item->{Isles}= [ @i ];
+       $item->{Archs}= [ @a ];
+       $item->{Start}= $i[0];
+       $item->{Finish}= $i[-1];
+       $item->{Vias}= [ ];
+       my $i;
+       for ($i=1; $i < @i-1; $i++) {
+               push @{ $item->{Vias} }, $i[$i];
+       }
        $results{$ap}{$isles}= $item;
 }
 
@@ -164,17 +195,38 @@ if ($qa->{'debug'}) {
 </%perl>
 % foreach my $ap (qw(A P)) {
 <h2>ap=<% $ap %></h2>
-<table rules=all>
+<table rules=groups>
+<colgroup span=2>
+<colgroup span=1>
+<colgroup span=3>
+<tbody>
+<tr>
+<th colspan=2>Profit
+<th>Archipelagoes
+<th colspan=3>Route
+<tr>
+<th>Abs.
+<th>Per.lg.
+<th>
+<th>Start
+<th>Via
+<th>Finish
+<tbody>
+%      my $datarow=0;
 %      foreach my $isles (sort {
-%                      $results{$ap}{$a}{Values}{$ap} <=>
-%                      $results{$ap}{$b}{Values}{$ap}
+%                      $results{$ap}{$b}{$ap} <=>
+%                      $results{$ap}{$a}{$ap}
 %              } keys %{$results{$ap}}) {
 %              my $item= $results{$ap}{$isles};
-<tr>
+<tr class="datarow<% $datarow %>">
 <td align=right><% $item->{A} |h %>
 <td align=right><% $item->{P} |h %>
-<td align=center><% $isles |h %>
+<td align=left><% join ', ', @{ $item->{Archs} } |h %>
+<td align=left><% $item->{Start} |h %>, 
+<td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
+<td align=left><% $item->{Finish} |h %>
 </td>
+%              $datarow ^= 1;
 %      } # $isles
 </table>
 % } # $ap