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=153ea792c92e7f9abcc9eac7472d37c72bdb7fca;hpb=29010a75143814a91b4f5200454bea879280e7c1;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 153ea79..c801a63 100644
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -75,7 +75,8 @@ my $qa= \%ARGS;
 <%perl>
 
 $emsgokorprint->($emsg) or $cmid=undef;
-return unless defined $cmid;
+print("</div>"), return
+	unless defined $cmid;
 $someresults->();
 
 #---------- actually compute the results and print them ----------
@@ -98,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"
 		);
@@ -215,3 +216,4 @@ No offers.
 <%perl>
 }
 </%perl>
+</div>