X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=0adf9920bbbc6bb96bd0f05ad0f7d4fa78ece764;hb=73e2dfca626db42870a6e1342f7f7ead4a5a819e;hp=c135e67bc5b16a69452fec1a559f332eebf1a5cd;hpb=c20deee42fbd2d86e976bb6a2e4f8e5f5cf2631b;p=ypp-sc-tools.main.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index c135e67..0adf992 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -115,9 +115,11 @@ my $stmt= " SELECT sell_islands.islandname org_name, sell_islands.islandid org_id, sell.price org_price, + sell_uploads.timestamp org_timestamp, buy_islands.islandname dst_name, buy_islands.islandid dst_id, buy.price dst_price, + buy_uploads.timestamp dst_timestamp, ".($qa->{ShowStalls} ? " sell.stallid org_stallid, sell_stalls.stallname org_stallname, @@ -140,6 +142,8 @@ my $stmt= " JOIN sell ON commods.commodid = sell.commodid JOIN islands AS sell_islands ON sell.islandid = sell_islands.islandid JOIN islands AS buy_islands ON buy.islandid = buy_islands.islandid + JOIN uploads AS sell_uploads ON sell.islandid = sell_uploads.islandid + JOIN uploads AS buy_uploads ON buy.islandid = buy_uploads.islandid ".($qa->{ShowStalls} ? " JOIN stalls AS sell_stalls ON sell.stallid = sell_stalls.stallid JOIN stalls AS buy_stalls ON buy.stallid = buy_stalls.stallid @@ -532,15 +536,55 @@ Sail to <% $islandname |h %> % foreach my $od (qw(dst org)) { % my $sign= $od eq 'dst' ? -1 : +1; -% foreach my $f (sort { -% $a->{'commodname'} cmp $b->{'commodname'} -% or $sign * ($a->{"${od}_price"} <=> $b->{"${od}_price"}) -% or $a->{"${od}_stallname"} cmp $b->{"${od}_stallname"} -% } @flows) { +% my %todo; +% foreach my $f (@flows) { % next if $f->{Suppress}; % next unless $f->{"${od}_id"} == $islandids[$i]; % next unless $f->{OptQty}; -