X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fcreateretal.pl;h=6ee3ef4c91cce1c95ac02fdf526a29fa983f8e68;hb=a046de4c8ad5879008a11ad1b9807d6a2e5cc9c0;hp=bfdce31738d3446c55234e31e8d3c6db186aeb6d;hpb=bb8b18a775b0c6017a16003bfe79ec3eae159403;p=ndwebbie.git

diff --git a/scripts/createretal.pl b/scripts/createretal.pl
index bfdce31..6ee3ef4 100755
--- a/scripts/createretal.pl
+++ b/scripts/createretal.pl
@@ -43,19 +43,19 @@ $query->finish;
 
 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 sender,array_accum(i.eta) AS eta,array_accum(amount) AS amount
-	,array_accum(shiptype) AS type,array_accum(fleet) AS name,array_accum(c.landing_tick) AS landing
+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 sender
+	GROUP BY pid
 	});
 $incs->execute;
 
@@ -69,7 +69,7 @@ while (my $inc = $incs->fetchrow_hashref){
 		my $back = $landing + $eta;
 		$comment .= "$name: ETA=$eta Amount=$amount Type:'$type' Landing tick=$landing Estimated back:$back\n";
 	}
-	$addtarget->execute($raid,$inc->{sender},$comment);
+	$addtarget->execute($raid,$inc->{pid},$comment);
 }
 
 $dbh->commit;