Better answers for arch queries

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index ad826579c0907e48b219d4270d6e4ec203dbdff8..9a7b036cdde9b468233f5a770a2dafec1d59420e 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -12,7 +12,7 @@ my $sd_condition= sub {
        my ($bs, $ix) = @_;
        my $islandid= $islandids[$ix];
        if (defined $islandid) {
        my ($bs, $ix) = @_;
        my $islandid= $islandids[$ix];
        if (defined $islandid) {

-               return "${bs}_islands.islandid = $islandid";
+               return "${bs}.islandid = $islandid";

        } else {
                push @query_params, $archipelagoes[$ix];
                return "${bs}_islands.archipelago = ?";
        } else {
                push @query_params, $archipelagoes[$ix];
                return "${bs}_islands.archipelago = ?";


@@ -23,7 +23,14 @@ foreach my $src_i (0..$#islandids) {
        my $src_cond= $sd_condition->('sell',$src_i);
        my @dst_conds;
        foreach my $dst_i ($src_i..$#islandids) {
        my $src_cond= $sd_condition->('sell',$src_i);
        my @dst_conds;
        foreach my $dst_i ($src_i..$#islandids) {

-               push @dst_conds, $sd_condition->('buy',$dst_i);
+               my $dst_cond= $sd_condition->('buy',$dst_i);
+               if ($dst_i==$src_i and !defined $islandids[$src_i]) {
+                       # we always want arbitrage, but mentioning an arch
+                       # once shouldn't produce intra-arch trades
+                       $dst_cond=
+                               "($dst_cond AND sell.islandid = buy.islandid)";
+               }
+               push @dst_conds, $dst_cond;

        }
        push @flow_conds, "$src_cond AND (
                        ".join("
        }
        push @flow_conds, "$src_cond AND (
                        ".join("