X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_commod;h=8d55f2686130568ba92d2c578dd787d2362e368e;hb=a0835ba69f333931705bf31f39b82339e7c5b16a;hp=4869e5c50fad00d6222fa0a1ce8e2df110f488a9;hpb=890faab73220a817300d53a362464d6a7fc06788;p=ypp-sc-tools.web-live.git
diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 4869e5c..8d55f26 100644
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -36,6 +36,7 @@
<%args>
$quri
$dbh
+$commodid => undef;
$commodstring => '';
$prselector
$someresults
@@ -44,34 +45,23 @@ $emsgokorprint
<%perl>
my $emsg;
-my ($commodname,$commodid);
+my ($commodname,$cmid);
my $qa= \%ARGS;
%perl>
+
Commodity enquiry
% $prselector->('BuySell');
-
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
-
-Enter commodity (abbreviations are OK):
+% $prselector->('ShowBlank');
%#========== results ==========
+
+
<%perl>
-$emsgokorprint->($emsg) or $commodid=undef;
-return unless defined $commodid;
+$emsgokorprint->($emsg) or $cmid=undef;
+print("
"), return
+ unless defined $cmid;
$someresults->();
#---------- actually compute the results and print them ----------
@@ -94,13 +87,13 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
my ($ascdesc) = ($bs eq 'buy')
? ('DESC')
: ('ASC');
-#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 LEFT OUTER JOIN $bs offers
+ FROM islands $joinkind $bs offers
ON islands.islandid == offers.islandid AND commodid == ?
- GROUP BY islands.islandid,
+ GROUP BY islands.islandid
ORDER BY archipelago, islandname"
);
@@ -110,32 +103,39 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
WHERE commodid = ? AND islandid = ?
ORDER BY price $ascdesc"
);
- # fixme this query is utterly wrong
%perl>
Offers to <% uc $bs |h %> <% $commodname |h %>
-
-
+% $islands->execute($cmid);
+% my $island;
+% my %ts_sortkeys;
+% my $rowix= 0;
+% while ($island= $islands->fetchrow_hashref) {
+% if (!$rowix) {
+
+
+
+
+
-
+ |
+ |
| Prices
- | Quantities available
- |
+Quantity at price
+ |
Archipelago
| Island
- | Unique best stall
+ | Stall(s)
| Best
| Median
- | At best
- | Within 10%
- | Total
+ | Best
+ | +/-10%
+ | Any
|
-% $islands->execute($commodid);
-% my $island;
-% 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= '';
@@ -159,21 +159,61 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
% $approxqty += $qty;
% }
% }
-% my $nstalls= @beststalls;
-% $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
- <% $island->{'archipelago'} |h %>
- | <% $island->{'islandname'} |h %>
- | <% $nstalls==0 ? '-' :
- $nstalls==1 ? $beststalls[0] : "$nstalls offers" |h %>
- | <% length $bestqty ? $bestprice : '-' %>
- | <% $median %>
- | <% $bestqty %>
- | <% $approxqty %>
- | <% $cqty %>
+% my $stallname;
+%
+% my $rowid= "id_${bs}_$islandid";
+% my $s= [ ];
+%
+% $s->[2]= sprintf "%06d", scalar @beststalls;
+% if (!@beststalls) {
+% $stallname= '-';
+% } elsif (@beststalls==1) {
+% $stallname= $beststalls[0];
+% $s->[2] .= " $stallname";
+% } else {
+% $stallname= sprintf "%d offers", scalar @beststalls;
+% }
+%
+% $cqty == $tqty or die "$bs $cqty $tqty $cmid $islandid ";
+ |
class="<% 'datarow'.($rowix & 1) %>">
+ <% $s->[0]= $island->{'archipelago'} |h %>
+ | <% $s->[1]= $island->{'islandname'} |h %>
+ | <% $stallname |h %>
+ | <% $s->[3]= (length $bestqty ? $bestprice : '-') %>
+ | <% $s->[4]= $median %>
+ | <% $s->[5]= $bestqty %>
+ | <% $s->[6]= $approxqty %>
+ | <% $s->[7]= $cqty %>
|
+% for my $cix (0..$#$s) {
+% $ts_sortkeys{$cix}{$rowid}= $s->[$cix];
+% }
+% $rowix++;
% }
+% if ($rowix) {
+<&| tabsort, table => "${bs}_table", sortkeys => "${bs}_sortkeys",
+ throw => "${bs}_table_thr", rowclass => 'datarow', cols => [
+ {}, {},
+ { DoReverse => 1 },
+ { DoReverse => 1, Numeric => 1, MapFn => "ts_Pricemap_${bs}" },
+ { DoReverse => 1, Numeric => 1, MapFn => "ts_Pricemap_${bs}" },
+ { DoReverse => 1, Numeric => 1 },
+ { DoReverse => 1, Numeric => 1 },
+ { DoReverse => 1, Numeric => 1 },
+ ] &>
+ <% $bs %>_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+ function ts_Pricemap_<% $bs %>(price) {
+ if (price=='-') { return <% $bs eq 'buy' ? '-1' : '99999999' %>; }
+ return price;
+ }
+&tabsort>
+% } else {
+No offers.
+% }
+
<%perl>
}
%perl>
+