Просмотр исходного кода

Fix bug in mIRC6 format where it didn't recognize logfiles logging seconds, or kicks of the maintainer

sbingner 23 лет назад
Родитель
Сommit
ba7e7af0e7
2 измененных файлов с 5 добавлено и 3 удалено
  1. 2 0
      docs/Changelog
  2. 3 3
      modules/Pisg/Parser/Format/mIRC6.pm

+ 2 - 0
docs/Changelog

@@ -10,6 +10,8 @@ pisg (x.xx)
    * Add modified version of patch from minicus - allows browser to split words
    * Add modified version of patch from minicus - allows browser to split words
      at QuoteWidth number of characters into any given word, without splitting
      at QuoteWidth number of characters into any given word, without splitting
      URL's (new config option)
      URL's (new config option)
+   * Fix bug in mIRC6 format where it didn't recognize logfiles logging seconds
+   * Fix bug in mIRC6 format where it didn't recognize kicks of the maintainer
 
 
 pisg (0.44) - Sun Dec, 15th 2002
 pisg (0.44) - Sun Dec, 15th 2002
    * Fixed an error in the mIRC6 format which caused pisg to abort on some
    * Fixed an error in the mIRC6 format which caused pisg to abort on some

+ 3 - 3
modules/Pisg/Parser/Format/mIRC6.pm

@@ -10,8 +10,8 @@ sub new
     my ($type, %args) = @_;
     my ($type, %args) = @_;
     my $self = {
     my $self = {
         cfg => $args{cfg},
         cfg => $args{cfg},
-        normalline => '^\[(\d+):\d+\] <([^>]+)> (.*)',
-        thirdline  => '^\[(\d+):(\d+)\] \* (.+)'
+        normalline => '^\[(\d+):\d+:?\d*\] <([^>]+)> (.*)',
+        thirdline  => '^\[(\d+):(\d+):?\d*\] \* (.+)'
     };
     };
 
 
     bless($self, $type);
     bless($self, $type);
@@ -62,7 +62,7 @@ sub thirdline
 
 
         } elsif ($#line >= 4 && ($line[1].$line[2]) eq 'werekicked' && ($line[$#line] =~ /\)$/)) {
         } elsif ($#line >= 4 && ($line[1].$line[2]) eq 'werekicked' && ($line[$#line] =~ /\)$/)) {
                 $hash{kicker} = $line[4];
                 $hash{kicker} = $line[4];
-                $hash{nick} = $self->{cfg}{botnick};
+                $hash{nick} = $self->{cfg}{maintainer};
 
 
         } elsif ($#line >= 4 && ($line[1] eq 'changes') && ($line[$#line] =~ /\'$/)) {
         } elsif ($#line >= 4 && ($line[1] eq 'changes') && ($line[$#line] =~ /\'$/)) {
                 $hash{newtopic} = join(' ', @line[4..$#line]);
                 $hash{newtopic} = join(' ', @line[4..$#line]);