Update retal raid script for the new infrastructure

diff --git a/scripts/createretal.pl b/scripts/createretal.pl
index e2f8688eca06db8410e4c0eeef5f2a2f79f6816e..6ee3ef4c91cce1c95ac02fdf526a29fa983f8e68 100755 (executable)
--- a/scripts/createretal.pl
+++ b/scripts/createretal.pl
@@ -43,17 +43,17 @@ $query->finish;
 
 print "$raid\n";
 
 
 print "$raid\n";
 

-$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,2)}
+$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,'M')}

        ,undef,$raid);
 
        ,undef,$raid);
 

-my $addtarget = $dbh->prepare(q{INSERT INTO raid_targets(raid,planet,comment)
+my $addtarget = $dbh->prepare(q{INSERT INTO raid_targets(raid,pid,comment)

        VALUES($1,$2,$3)});
 
 my $incs = $dbh->prepare(q{SELECT pid,array_agg(i.eta) AS eta,array_agg(amount) AS amount
        ,array_agg(shiptype) AS type,array_agg(fleet) AS name,array_agg(c.landing_tick) AS landing
        FROM calls c
        VALUES($1,$2,$3)});
 
 my $incs = $dbh->prepare(q{SELECT pid,array_agg(i.eta) AS eta,array_agg(amount) AS amount
        ,array_agg(shiptype) AS type,array_agg(fleet) AS name,array_agg(c.landing_tick) AS landing
        FROM calls c

-               JOIN incomings i ON i.call = c.id
-       WHERe NOT c.covered AND c.landing_tick BETWEEN tick() AND tick() + 6
+               JOIN incomings i USING (call)
+       WHERE c.status <> 'Covered' AND c.landing_tick BETWEEN tick() AND tick() + 6

                AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10
        GROUP BY pid
        });
                AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10
        GROUP BY pid
        });