]> ruin.nu Git - ndwebbie.git/commitdiff
better parsing
authorMichael Andreen <harv@ruin.nu>
Thu, 1 Feb 2007 15:17:56 +0000 (15:17 +0000)
committerMichael Andreen <harv@ruin.nu>
Thu, 1 Feb 2007 15:17:56 +0000 (15:17 +0000)
ND/Web/Pages/LaunchConfirmation.pm

index 0842b3295d505b89eb4d951b5e7ff49ecef1f689..dda401e1102eafdb2785402472467427ede6ba8d 100644 (file)
@@ -62,8 +62,9 @@ sub render_body {
                }
                my @missions;
                $DBH->begin_work;
-               while ($missions =~ m/\S+\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins\s+(Attack|Defend|Return|Fake Attack|Fake Defend)(.*?)(?:Launching in tick (\d+), arrival in tick (\d+)|ETA: \d+, Return ETA: (\d+))/sg){
+               while ($missions =~ m/\S+\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins\s+(Attack|Defend|Return|Fake Attack|Fake Defend)(.*?)(?:Launching in tick (\d+), arrival in tick (\d+)|ETA: \d+, Return ETA: (\d+)|Return ETA: (\d+))/sg){
                        my %mission;
+                       next if $9 eq 'Return';
 
                        my $tick = $self->{TICK}+$8;
                        $tick += $7 if defined $7;