X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_commod;h=c9b17ae6700b72a0e5ba135a14d95ff381ae3a98;hp=aeee3cee83d0bf8288ee79903ec005e20b36f4fc;hb=00ba9271fd8409f29fcae6ee2af15824810bc939;hpb=608bc9e07b5c8a961325fd1b8d5b92f65418b949

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index aeee3ce..c9b17ae 100644
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -52,6 +52,7 @@ my $qa= \%ARGS;
 <h1>Commodity enquiry</h1>
 
 % $prselector->('BuySell');
+% $prselector->('ShowBlank');
 
 %#---------- textbox, user enters route as string ----------
 % if (!$qa->{Dropdowns}) {
@@ -91,35 +92,86 @@ $someresults->();
 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 $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,
+		ORDER BY archipelago, islandname"
+		);
 
-	my $sth= $dbh->prepare(
-	"SELECT archipelago, islandname, stallname, price, qty
-		FROM $bs NATURAL JOIN stalls NATURAL JOIN islands
-		WHERE commodid = ?"
+	my $offers= $dbh->prepare(
+	"SELECT stallname, price, qty
+		FROM $bs NATURAL JOIN stalls
+		WHERE commodid = ? AND islandid = ?
+		ORDER BY price $ascdesc"
 		);
 	# fixme this query is utterly wrong
 
-	$sth->execute($commodid);
-
 </%perl>
 
 <h2>Offers to <% uc $bs |h %> <% $commodname |h %></h2>
 
 <table>
 <tr>
+<th colspan=3>
+<th colspan=2>Prices
+<th colspan=3>Quantities available
+<tr>
 <th>Archipelago
 <th>Island
-<th>Best stall
-<th>Best price
-<th>Qty at best
+<th>Unique best stall
+<th>Best
+<th>Median
+<th>At best
+<th>Within 10%
+<th>Total
 </tr>
-%	my $row;
-%	while ($row=$sth->fetchrow_hashref) {
-<tr> <td><% $row->{'archipelago'} %>
-     <td><% $row->{'islandname'} %>
-     <td><% $row->{'stallname'} %>
-     <td><% $row->{'price'} %>
-     <td><% $row->{'qty'} %>
+%	$islands->execute($commodid);
+%	my $island;
+%	while ($island= $islands->fetchrow_hashref) {
+%		my $islandid= $island->{'islandid'};
+%		$offers->execute($commodid, $islandid);
+%		my ($offer, $bestprice, $marginal, @beststalls);
+%		my $tqty= $island->{'tqty'};
+%		my $cqty= '';
+%		my $bestqty= '';
+%		my $approxqty= '';
+%		my $median= '-';
+%		while ($offer= $offers->fetchrow_hashref) {
+%			my $price= $offer->{'price'};
+%			my $qty= $offer->{'qty'};
+%			length $bestqty or $bestprice= $price;
+%			if ($price == $bestprice) {
+%				$bestqty += $qty;
+%				push @beststalls, $offer->{'stallname'};
+%			}
+%			$cqty += $qty;
+%			if ($cqty*2 >= $tqty && $median eq '-') {
+%				$median= $price;
+%			}
+%			if ($bestprice*9 <= $price*10 and
+%			    $price*10 <= $bestprice*11) {
+%				$approxqty += $qty;
+%			}
+%		}
+%		my $nstalls= @beststalls;
+%		$cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
+<tr> <td><% $island->{'archipelago'} |h %>
+     <td><% $island->{'islandname'} |h %>
+     <td><% $nstalls==0 ? '-' :
+            $nstalls==1 ? $beststalls[0] : "$nstalls offers" |h %>
+     <td><% length $bestqty ? $bestprice : '-' %>
+     <td><% $median %>
+     <td><% $bestqty %>
+     <td><% $approxqty %>
+     <td><% $cqty %>
 </tr>
 %	}
 </table>