Remove stale fixme comment

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

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 052d019f998b137cd103f806c46bbbb0f3e0fd4a..957526037a81b5107ad30f20ba805ceaf924d5e0 100644 (file)
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -89,22 +89,19 @@ $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"
                );
 
@@ -114,7 +111,6 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
                WHERE commodid = ? AND islandid = ?
                ORDER BY price $ascdesc"
                );
-       # fixme this query is utterly wrong
 
 </%perl>
 
@@ -138,6 +134,7 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %      $islands->execute($commodid);
 %      my $island;
 %      my %ts_sortkeys;
+%      my $rowix= 0;
 %      while ($island= $islands->fetchrow_hashref) {
 %              my $islandid= $island->{'islandid'};
 %              $offers->execute($commodid, $islandid);
@@ -180,7 +177,7 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %              }
 %
 %              $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
-<tr id=<% $rowid %> >
+<tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>">
      <td><% $s->[0]= $island->{'archipelago'} |h %>
      <td><% $s->[1]= $island->{'islandname'} |h %>
      <td><%          $stallname |h %>
@@ -193,11 +190,12 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %              for my $cix (0..$#$s) {
 %                      $ts_sortkeys{$cix}{$rowid}= $s->[$cix];
 %              }
+%              $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 +204,13 @@ 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>
 
 <%perl>
 }
 </%perl>
-
-<&| script &>
-  function all_onload() {
-<% $onloads %>
-  }
-  window.onload= all_onload;
-</&>