Works when a tab separator is used for IIS log files.

diff --git a/tools/logresolvemerge.pl b/tools/logresolvemerge.pl
index b9660258794543575fbd9629230bad2f442569ae..81d4eba041d538bd02a63d1fd39a4795d5b7082c 100644 (file)
--- a/tools/logresolvemerge.pl
+++ b/tools/logresolvemerge.pl
@@ -499,7 +499,7 @@ while (1 == 1)
 
                                # Split DD/Month/YYYY:HH:MM:SS or YYYY-MM-DD HH:MM:SS or MM/DD/YY\tHH:MM:SS
                                my $year=0; my $month=0; my $day=0; my $hour=0; my $minute=0; my $second=0;
-                               if ($_ =~ /(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) { $year=$1; $month=$2; $day=$3; $hour=$4; $minute=$5; $second=$6; }
+                               if ($_ =~ /(\d\d\d\d)-(\d\d)-(\d\d)\s(\d\d):(\d\d):(\d\d)/) { $year=$1; $month=$2; $day=$3; $hour=$4; $minute=$5; $second=$6; }
                                elsif ($_ =~ /\[(\d\d)[\/:\s](\w+)[\/:\s](\d\d\d\d)[\/:\s](\d\d)[\/:\s](\d\d)[\/:\s](\d\d) /) { $year=$3; $month=$2; $day=$1; $hour=$4; $minute=$5; $second=$6; }
                                elsif ($_ =~ /\[\w+ (\w+) (\d\d) (\d\d)[\/:\s](\d\d)[\/:\s](\d\d) (\d\d\d\d)\]/) { $year=$6; $month=$1; $day=$2; $hour=$3; $minute=$4; $second=$5; }