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=3c2049ca3a509af276a9c28b9c59dbdf463667f5;hb=53dfe71f6c510ee12bbf6bdaeb3984024d34a7be;hpb=767e625796d67e5f5cc94d7e1949b1389f753764
diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 3c2049c..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,35 +45,23 @@ $emsgokorprint
<%perl>
my $emsg;
-my ($commodname,$commodid);
+my ($commodname,$cmid);
my $qa= \%ARGS;
%perl>
+
Commodity enquiry
% $prselector->('BuySell');
% $prselector->('ShowBlank');
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
-
-Enter commodity (abbreviations are OK):
-
%#========== 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 ----------
@@ -111,15 +103,24 @@ 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
|
@@ -132,13 +133,9 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
+/-10%
| Any
|
-% $islands->execute($commodid);
-% my $island;
-% my %ts_sortkeys;
-% my $rowix= 0;
-% 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= '';
@@ -177,22 +174,23 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
% $stallname= sprintf "%d offers", scalar @beststalls;
% }
%
-% $cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
+% $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 %>
+ | <% $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",
@@ -211,7 +209,11 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
return price;
}
&tabsort>
+% } else {
+No offers.
+% }
<%perl>
}
%perl>
+