yarrg database code: eliminate all NATURAL JOINs and turn them into JOIN USING

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

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 052d019f998b137cd103f806c46bbbb0f3e0fd4a..c801a631e65855d4e762aa247bb702bf883ecfc1 100644 (file)
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -36,6 +36,7 @@
 <%args>
 $quri
 $dbh
+$commodid => undef;
 $commodstring => '';
 $prselector
 $someresults
@@ -44,35 +45,23 @@ $emsgokorprint
 
 <%perl>
 my $emsg;
-my ($commodname,$commodid);
+my ($commodname,$cmid);
 
 my $qa= \%ARGS;
 </%perl>
 
+<div class="query">
 <h1>Commodity enquiry</h1>
 
 % $prselector->('BuySell');
 % $prselector->('ShowBlank');
 
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
-
-Enter commodity (abbreviations are OK):<br>
-
 <form action="<% $quri->() |h %>" method="get">
 
-<&| qtextstring, qa => $qa, dbh => $dbh,
-    thingstring => 'commodstring', emsgstore => \$emsg,
-    perresult => sub { ($commodname,$commodid)= @_; }
+<& enter_commod, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+       commodname_r => \$commodname,
+       cmid_r => \$cmid
  &>
- size=80
-</&>
-
-% } else { #---------- dropdowns, user selects from menus ----------
-
-Not yet implemented.
-
-% } #---------- end of dropdowns, now common middle of page code ----------
 
 <input type=submit name=submit value="Go">
 % my $ours= sub { $_[0] =~ m/^commodstring|^commodid/; };
@@ -81,48 +70,57 @@ Not yet implemented.
 </form>
 
 %#========== results ==========
+</div>
+<div class="results">
 <%perl>
 
-$emsgokorprint->($emsg) or $commodid=undef;
-return unless defined $commodid;
+$emsgokorprint->($emsg) or $cmid=undef;
+print("</div>"), return
+       unless defined $cmid;
 $someresults->();
 
 #---------- actually compute the results and print them ----------
 
-my $onloads= "";
-
 foreach my $bs (split /_/, $ARGS{BuySell}) {
        $bs =~ m/^(buy|sell)$/ or die;
        $bs= $1;
        my ($ascdesc) = ($bs eq 'buy')
                ? ('DESC')
                : ('ASC');
-       my $joinkind= $ARGS{ShowBlank} eq 'show'
-               ? 'LEFT OUTER JOIN' : 'INNER JOIN';
+       my $joinkind= $ARGS{ShowBlank} ? 'LEFT OUTER JOIN' : 'INNER JOIN';
        my $islands= $dbh->prepare(
        "SELECT islands.islandid AS islandid, archipelago, islandname,
                        sum(qty) as tqty
                FROM islands $joinkind $bs offers
                ON islands.islandid == offers.islandid AND commodid == ?
-               GROUP BY islands.islandid,
+               GROUP BY islands.islandid
                ORDER BY archipelago, islandname"
                );
 
        my $offers= $dbh->prepare(
        "SELECT stallname, price, qty
-               FROM $bs NATURAL JOIN stalls
+               FROM $bs JOIN stalls USING (stallid, islandid)
                WHERE commodid = ? AND islandid = ?
                ORDER BY price $ascdesc"
                );
-       # fixme this query is utterly wrong
 
 </%perl>
 
 <h2>Offers to <% uc $bs |h %> <% $commodname |h %></h2>
-
-<table id="<% $bs %>_table">
+%      $islands->execute($cmid);
+%      my $island;
+%      my %ts_sortkeys;
+%      my $rowix= 0;
+%      while ($island= $islands->fetchrow_hashref) {
+%              if (!$rowix) {
+<table class="data" id="<% $bs %>_table" rules=groups>
+<colgroup span=2>
+<colgroup span=1>
+<colgroup span=2>
+<colgroup span=3>
 <tr>
-<th colspan=3>
+<th colspan=2>
+<th colspan=1>
 <th colspan=2>Prices
 <th colspan=3>Quantity at price
 <tr id="<% $bs %>_table_thr">
@@ -135,12 +133,9 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 <th>+/-10%
 <th>Any
 </tr>
-%      $islands->execute($commodid);
-%      my $island;
-%      my %ts_sortkeys;
-%      while ($island= $islands->fetchrow_hashref) {
+%              }
 %              my $islandid= $island->{'islandid'};
-%              $offers->execute($commodid, $islandid);
+%              $offers->execute($cmid, $islandid);
 %              my ($offer, $bestprice, $marginal, @beststalls);
 %              my $tqty= $island->{'tqty'};
 %              my $cqty= '';
@@ -179,25 +174,27 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %                      $stallname= sprintf "%d offers", scalar @beststalls;
 %              }
 %
-%              $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
-<tr id=<% $rowid %> >
+%              $cqty == $tqty or die "$bs $cqty $tqty $cmid $islandid ";
+<tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>">
      <td><% $s->[0]= $island->{'archipelago'} |h %>
      <td><% $s->[1]= $island->{'islandname'} |h %>
      <td><%          $stallname |h %>
-     <td><% $s->[3]= (length $bestqty ? $bestprice : '-') %>
-     <td><% $s->[4]= $median %>
-     <td><% $s->[5]= $bestqty %>
-     <td><% $s->[6]= $approxqty %>
-     <td><% $s->[7]= $cqty %>
+     <td align=right><% $s->[3]= (length $bestqty ? $bestprice : '-') %>
+     <td align=right><% $s->[4]= $median %>
+     <td align=right><% $s->[5]= $bestqty %>
+     <td align=right><% $s->[6]= $approxqty %>
+     <td align=right><% $s->[7]= $cqty %>
 </tr>
 %              for my $cix (0..$#$s) {
 %                      $ts_sortkeys{$cix}{$rowid}= $s->[$cix];
 %              }
+%              $rowix++;
 %      }
+%      if ($rowix) {
 </table>
 
-<& tabsort,    table => "${bs}_table", sortkeys => "${bs}_sortkeys",
-               throw => "${bs}_table_thr", cols => [
+<&| tabsort,   table => "${bs}_table", sortkeys => "${bs}_sortkeys",
+               throw => "${bs}_table_thr", rowclass => 'datarow', cols => [
        {}, {},
        { DoReverse => 1 },
        { DoReverse => 1, Numeric => 1, MapFn => "ts_Pricemap_${bs}" },
@@ -206,22 +203,17 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
        { DoReverse => 1, Numeric => 1 },
        { DoReverse => 1, Numeric => 1 },
        ] &>
-<&| script &>
   <% $bs %>_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
   function ts_Pricemap_<% $bs %>(price) {
     if (price=='-') { return <% $bs eq 'buy' ? '-1' : '99999999' %>; }
     return price;
   }
-</&>
-%      $onloads .= "    ts_onload__${bs}_table();\n";
+</&tabsort>
+%      } else {
+No offers.
+%      }
 
 <%perl>
 }
 </%perl>
-
-<&| script &>
-  function all_onload() {
-<% $onloads %>
-  }
-  window.onload= all_onload;
-</&>
+</div>