|
|
@@ -18,14 +18,14 @@ sub new
|
|
|
my $thirdtimestamp = '\d+-[\d\w]+-\d+[ T](\d+):(\d+):\d+';
|
|
|
my $self = {
|
|
|
cfg => $args{cfg},
|
|
|
- # Old default timestamp format
|
|
|
- # [12-Feb-2004 16:59:42] <philipss> plop
|
|
|
- # New default timestamp format
|
|
|
- # 2004-02-12T16:59:42 <philipss> plop
|
|
|
- normalline => '^\[?'.$timestamp.']? <(\S+)> (.*)',
|
|
|
- # [05-Mar-2004 17:28:10] * Jkx|home bon je vais pas trainer ..
|
|
|
+ # Old default timestamp format
|
|
|
+ # [12-Feb-2004 16:59:42] <philipss> plop
|
|
|
+ # New default timestamp format
|
|
|
+ # 2004-02-12T16:59:42 <philipss> plop
|
|
|
+ normalline => '^\[?'.$timestamp.']? <(\S+)> (.*)',
|
|
|
+ # [05-Mar-2004 17:28:10] * Jkx|home bon je vais pas trainer ..
|
|
|
actionline => '^\[?'.$timestamp.']? \* (\S+) (.*)',
|
|
|
- # [17-Feb-2004 08:13:47] *** Jkx changes topic to "Oh my god of topic"
|
|
|
+ # [17-Feb-2004 08:13:47] *** Jkx changes topic to "Oh my god of topic"
|
|
|
thirdline => '\[?'.$thirdtimestamp.']? \*\*\* (\S+) (\S+) (\S+) (\S+) ?(.*)?',
|
|
|
};
|
|
|
|
|
|
@@ -72,14 +72,12 @@ sub thirdline
|
|
|
my %hash;
|
|
|
|
|
|
if ($line =~ /$self->{thirdline}/o) {
|
|
|
-
|
|
|
- $hash{hour} = $1;
|
|
|
+
|
|
|
+ $hash{hour} = $1;
|
|
|
$hash{min} = $2;
|
|
|
$hash{nick} = $3;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- # print "*** 1/$1 2/$2 3/$3 4/$4 5/$5 6/$6 7/$7 ***\n";
|
|
|
+ # print "*** 1/$1 2/$2 3/$3 4/$4 5/$5 6/$6 7/$7 ***\n";
|
|
|
|
|
|
if (($4.$5) eq 'waskicked') {
|
|
|
$hash{kicker} = $7;
|
|
|
@@ -88,20 +86,16 @@ sub thirdline
|
|
|
$hash{kicktext} =~ s/^\((.*)\)$/$1/;
|
|
|
} elsif (($4.$5) eq 'changestopic') {
|
|
|
$hash{newtopic} = $7;
|
|
|
- } elsif (($4.$5) eq 'setsmode:') {
|
|
|
+ } elsif (($4.$5) eq 'setsmode:') {
|
|
|
$hash{newmode} = $6;
|
|
|
$hash{modechanges} = $7;
|
|
|
} elsif (($4.$5) eq 'hasjoined') {
|
|
|
$hash{newjoin} = $3;
|
|
|
- } elsif (($5,$6) eq 'nowknown') {
|
|
|
- $hash{newnick} = $6;
|
|
|
+ } elsif (($5.$6) eq 'nowknown') {
|
|
|
+ $hash{newnick} = $7;
|
|
|
$hash{newnick} =~ s/^as\s*//;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
- # print %hash;
|
|
|
- # print "\n";
|
|
|
return \%hash;
|
|
|
|
|
|
} else {
|