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);
-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
- 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
});