X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_commod;h=8d55f2686130568ba92d2c578dd787d2362e368e;hp=9a7d2bc36dc7bad67e67bfbc6c92688e6902862a;hb=53dfe71f6c510ee12bbf6bdaeb3984024d34a7be;hpb=b939ad368af00f2265a915d259041b8e2cb303c4
diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 9a7d2bc..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,12 +87,13 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
my ($ascdesc) = ($bs eq 'buy')
? ('DESC')
: ('ASC');
-
+ my $joinkind= $ARGS{ShowBlank} ? 'LEFT OUTER JOIN' : 'INNER JOIN';
my $islands= $dbh->prepare(
- "SELECT islandid, archipelago, islandname, sum(qty) as tqty
- FROM $bs NATURAL JOIN islands
- WHERE commodid = ?
- GROUP BY islandid,
+ "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
ORDER BY archipelago, islandname"
);
@@ -109,57 +103,117 @@ 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
+ | Quantity at price
+ |
Archipelago
| Island
- | Unique best stall
- | Best price
- | Qty at best
- | Median price
- | Total qty
+ | Stall(s)
+ | Best
+ | Median
+ | Best
+ | +/-10%
+ | Any
|
-% $islands->execute($commodid);
-% my $island;
-% while ($island= $islands->fetchrow_hashref) {
+% }
% my $islandid= $island->{'islandid'};
-% $offers->execute($commodid, $islandid);
-% my ($offer, $best, $median);
+% $offers->execute($cmid, $islandid);
+% my ($offer, $bestprice, $marginal, @beststalls);
% my $tqty= $island->{'tqty'};
-% my $cqty= 0;
+% my $cqty= '';
+% my $bestqty= '';
+% my $approxqty= '';
+% my $median= '-';
% while ($offer= $offers->fetchrow_hashref) {
-% if (!$best) {
-% $best= { 'price' => $offer->{'price'} };
+% my $price= $offer->{'price'};
+% my $qty= $offer->{'qty'};
+% length $bestqty or $bestprice= $price;
+% if ($price == $bestprice) {
+% $bestqty += $qty;
+% push @beststalls, $offer->{'stallname'};
% }
-% if ($offer->{'price'} == $best->{'price'}) {
-% $best->{'qty'} += $offer->{'qty'};
-% push @{ $best->{'stalls'} },
-% $offer->{'stallname'};
+% $cqty += $qty;
+% if ($cqty*2 >= $tqty && $median eq '-') {
+% $median= $price;
% }
-% $cqty += $offer->{'qty'};
-% if ($cqty*2 >= $tqty && !defined $median) {
-% $median= $offer->{'price'};
+% if ($bestprice*9 <= $price*10 and
+% $price*10 <= $bestprice*11) {
+% $approxqty += $qty;
% }
% }
-% $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
-% my $nstalls= @{ $best->{'stalls'} };
- <% $island->{'archipelago'} |h %>
- | <% $island->{'islandname'} |h %>
- | <% $nstalls==1 ? $best->{'stalls'}[0] : "$nstalls offers" |h %>
- | <% $best->{'price'} %>
- | <% $best->{'qty'} %>
- | <% $median %>
- | <% $tqty %>
+% 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>
+