Reorganise columns

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

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index a5c8846491dee9006406bc7c7fb3c1e2573b47a6..a4063c12204e703bbb748e07e3d444c3c0f89bc3 100644 (file)
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -49,7 +49,7 @@ my ($commodname,$commodid);
 my $qa= \%ARGS;
 </%perl>
 
-<h1>Select commodity enquiry</h1>
+<h1>Commodity enquiry</h1>
 
 % $prselector->('BuySell');
 
@@ -91,35 +91,82 @@ $someresults->();
 foreach my $bs (split /_/, $ARGS{BuySell}) {
        $bs =~ m/^(buy|sell)$/ or die;
        $bs= $1;
+       my ($ascdesc) = ($bs eq 'buy')
+               ? ('DESC')
+               : ('ASC');
+
+       my $islands= $dbh->prepare(
+       "SELECT islandid, archipelago, islandname, sum(qty) as tqty
+               FROM $bs NATURAL JOIN islands
+               WHERE commodid = ?
+               GROUP BY islandid,
+               ORDER BY archipelago, islandname"
+               );
 
-       my $sth= $dbh->prepare(
-       "SELECT archipelago, islandname, stallname, price, qty
-               FROM $bs NATURAL JOIN stalls NATURAL JOIN islands
-               WHERE commodid = ?"
+       my $offers= $dbh->prepare(
+       "SELECT stallname, price, qty
+               FROM $bs NATURAL JOIN stalls
+               WHERE commodid = ? AND islandid = ?
+               ORDER BY price $ascdesc"
                );
        # fixme this query is utterly wrong
 
-       $sth->execute($commodid);
-
 </%perl>
 
 <h2>Offers to <% uc $bs |h %> <% $commodname |h %></h2>
 
 <table>
 <tr>
+<th colspan=3>
+<th colspan=2>Prices
+<th colspan=3>Quantities available
+<tr>
 <th>Archipelago
 <th>Island
-<th>Best stall
-<th>Best price
-<th>Qty at best
+<th>Unique best stall
+<th>Best
+<th>Median
+<th>At best
+<th>Within 10%
+<th>Total
 </tr>
-%      my $row;
-%      while ($row=$sth->fetchrow_hashref) {
-<tr> <td><% $row->{'archipelago'} %>
-     <td><% $row->{'islandname'} %>
-     <td><% $row->{'stallname'} %>
-     <td><% $row->{'price'} %>
-     <td><% $row->{'qty'} %>
+%      $islands->execute($commodid);
+%      my $island;
+%      while ($island= $islands->fetchrow_hashref) {
+%              my $islandid= $island->{'islandid'};
+%              $offers->execute($commodid, $islandid);
+%              my ($offer, $bestprice, $median, $marginal, @beststalls);
+%              my $tqty= $island->{'tqty'};
+%              my $cqty= 0;
+%              my $bestqty= 0;
+%              my $approxqty= 0;
+%              while ($offer= $offers->fetchrow_hashref) {
+%                      my $price= $offer->{'price'};
+%                      my $qty= $offer->{'qty'};
+%                      defined $bestprice or $bestprice= $price;
+%                      if ($price == $bestprice) {
+%                              $bestqty += $qty;
+%                              push @beststalls, $offer->{'stallname'};
+%                      }
+%                      $cqty += $qty;
+%                      if ($cqty*2 >= $tqty && !defined $median) {
+%                              $median= $price;
+%                      }
+%                      if ($bestprice*9 <= $price*10 and
+%                          $price*10 <= $bestprice*11) {
+%                              $approxqty += $qty;
+%                      }
+%              }
+%              my $nstalls= @beststalls;
+%              $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
+<tr> <td><% $island->{'archipelago'} |h %>
+     <td><% $island->{'islandname'} |h %>
+     <td><% $nstalls==1 ? $beststalls[0] : "$nstalls offers" |h %>
+     <td><% $bestprice %>
+     <td><% $median %>
+     <td><% $bestqty %>
+     <td><% $approxqty %>
+     <td><% $tqty %>
 </tr>
 %      }
 </table>