X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_commod;h=c801a631e65855d4e762aa247bb702bf883ecfc1;hb=ac1cf45e4672ac30f232cee92e60eb1a2d17a5c5;hp=3b2bf3554533f40a334d63690dac86f023b16764;hpb=c9225ff45ee5e69855cb24cfb648d903dbba54a7;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 3b2bf35..c801a63 100644
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -50,6 +50,7 @@ my ($commodname,$cmid);
 my $qa= \%ARGS;
 </%perl>
 
+<div class="query">
 <h1>Commodity enquiry</h1>
 
 % $prselector->('BuySell');
@@ -69,10 +70,13 @@ my $qa= \%ARGS;
 </form>
 
 %#========== results ==========
+</div>
+<div class="results">
 <%perl>
 
 $emsgokorprint->($emsg) or $cmid=undef;
-return unless defined $cmid;
+print("</div>"), return
+	unless defined $cmid;
 $someresults->();
 
 #---------- actually compute the results and print them ----------
@@ -95,7 +99,7 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 
 	my $offers= $dbh->prepare(
 	"SELECT stallname, price, qty
-		FROM $bs NATURAL JOIN stalls
+		FROM $bs JOIN stalls USING (stallid, islandid)
 		WHERE commodid = ? AND islandid = ?
 		ORDER BY price $ascdesc"
 		);
@@ -109,7 +113,7 @@ foreach my $bs (split /_/, $ARGS{BuySell}) {
 %	my $rowix= 0;
 %	while ($island= $islands->fetchrow_hashref) {
 %		if (!$rowix) {
-<table id="<% $bs %>_table" rules=groups>
+<table class="data" id="<% $bs %>_table" rules=groups>
 <colgroup span=2>
 <colgroup span=1>
 <colgroup span=2>
@@ -212,3 +216,4 @@ No offers.
 <%perl>
 }
 </%perl>
+</div>