From 8ab709d6aa740c7ab3ebccb37903d8c12ef7b894 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sun, 15 Oct 2017 08:20:10 +0200 Subject: [PATCH] Handle eta column on fleet pastes --- lib/NDWeb/Controller/Members.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index 2e9c977..d0d7e31 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -595,7 +595,7 @@ sub parseconfirmations { |$returnetare)\s*/x; my $missre = qr/((?:Alliance\ Standby)|(?:(?:Fake\ )?\w+))\s*/x; if ($missions =~ m/ - Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ Base \s+ \(i\) \s (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ TOTAL \s+ + Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ ETA \s+ Base \s+ \(i\) \s (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ TOTAL \s+ (?.+?) \QTotal Ships in Fleet\E \s+ (\d+) \s+ (?\d+) \s+ (?\d+) \s+ (?\d+) \s+ Mission: \s* (?(?:$missre)*) \s* @@ -664,7 +664,7 @@ sub parseconfirmations { amount => 0, ships => [] }; - while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){ + while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS|--)[^\d]+\d+\s+((?:\d+\s*){5})/g){ my $ship = $1; my @amounts = split /\D+/, $3; my $base = shift @amounts; -- 2.39.2