X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_commod;h=b37fa39001e25ec966f234e4ff84735c340c18b7;hb=cf9d0277c5d6bfe900a0881a00984f8268a90514;hp=052d019f998b137cd103f806c46bbbb0f3e0fd4a;hpb=2b6a88303ee81419e9583c4fc34e71f4e692a2e0;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 052d019..b37fa39 100644
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -36,6 +36,7 @@
 <%args>
 $quri
 $dbh
+$commodid => undef;
 $commodstring => '';
 $prselector
 $someresults
@@ -44,7 +45,7 @@ $emsgokorprint
 
 <%perl>
 my $emsg;
-my ($commodname,$commodid);
+my ($commodname,$cmid);
 
 my $qa= \%ARGS;
 </%perl>
@@ -54,23 +55,34 @@ my $qa= \%ARGS;
 % $prselector->('BuySell');
 % $prselector->('ShowBlank');
 
+<form action="<% $quri->() |h %>" method="get">
+
 %#---------- textbox, user enters route as string ----------
 % if (!$qa->{Dropdowns}) {
 
 Enter commodity (abbreviations are OK):<br>
 
-<form action="<% $quri->() |h %>" method="get">
-
 <&| qtextstring, qa => $qa, dbh => $dbh,
     thingstring => 'commodstring', emsgstore => \$emsg,
-    perresult => sub { ($commodname,$commodid)= @_; }
+    perresult => sub { ($commodname,$cmid)= @_; }
  &>
  size=80
 </&>
 
 % } else { #---------- dropdowns, user selects from menus ----------
 
-Not yet implemented.
+%	my $sth= $dbh->prepare("SELECT commodname,commodid FROM commods
+%					ORDER BY commodname");
+%	$sth->execute();
+%	my $row;
+<select name="commodid">
+<option value="">Select commodity...</option>
+%	while ($row= $sth->fetchrow_arrayref) {
+%		my $selected= $commodid eq $row->[1] ? 'selected' : '';
+<option value="<% $row->[1] %>" <% $selected %>><% $row->[0] |h %></option>
+%		($commodname,$cmid) = @$row if $selected;
+%	}
+</select>
 
 % } #---------- end of dropdowns, now common middle of page code ----------
 
@@ -83,28 +95,25 @@ Not yet implemented.
 %#========== results ==========
 <%perl>
 
-$emsgokorprint->($emsg) or $commodid=undef;
-return unless defined $commodid;
+$emsgokorprint->($emsg) or $cmid=undef;
+return unless defined $cmid;
 $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,12 +123,16 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 		WHERE commodid = ? AND islandid = ?
 		ORDER BY price $ascdesc"
 		);
-	# fixme this query is utterly wrong
 
 </%perl>
 
 <h2>Offers to <% uc $bs |h %> <% $commodname |h %></h2>
-
+%	$islands->execute($cmid);
+%	my $island;
+%	my %ts_sortkeys;
+%	my $rowix= 0;
+%	while ($island= $islands->fetchrow_hashref) {
+%		if (!$rowix) {
 <table id="<% $bs %>_table">
 <tr>
 <th colspan=3>
@@ -135,12 +148,9 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 <th>+/-10%
 <th>Any
 </tr>
-%	$islands->execute($commodid);
-%	my $island;
-%	my %ts_sortkeys;
-%	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= '';
@@ -179,8 +189,8 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %			$stallname= sprintf "%d offers", scalar @beststalls;
 %		}
 %
-%		$cqty == $tqty or die "$bs $cqty $tqty $commodid $islandid ";
-<tr id=<% $rowid %> >
+%		$cqty == $tqty or die "$bs $cqty $tqty $cmid $islandid ";
+<tr id=<% $rowid %> class="<% 'datarow'.($rowix & 1) %>">
      <td><% $s->[0]= $island->{'archipelago'} |h %>
      <td><% $s->[1]= $island->{'islandname'} |h %>
      <td><%          $stallname |h %>
@@ -193,11 +203,13 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %		for my $cix (0..$#$s) {
 %			$ts_sortkeys{$cix}{$rowid}= $s->[$cix];
 %		}
+%		$rowix++;
 %	}
+%	if ($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 +218,16 @@ 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>
+%	} else {
+No offers.
+%	}
 
 <%perl>
 }
 </%perl>
-
-<&| script &>
-  function all_onload() {
-<% $onloads %>
-  }
-  window.onload= all_onload;
-</&>