Changeset 17088

Timestamp:

07/17/07 10:38:13 (16 months ago)

Author:

moritz

Message:

[irclog] fixed handling of empty abbr.dat / links.dat

Files:

• misc/irclog/IrcLog/WWW.pm (modified) (4 diffs)

misc/irclog/IrcLog/WWW.pm

@@ -157 +157 @@
 }
 
-my $re_abbr;
+my $re_abbr = qr/(?!)/;
 
 # read abbreviations from abbr.dat, store a regex in $re_abbr and create 
@@ -180 +180 @@
         close($abbr_file);
 
-        $re_abbr = join '|', map { "(?:$_)" } @patterns;
-        $re_abbr = qr/\b(?:$re_abbr)\b/;
-    } else {
-                # may never match
-                $re_abbr = qr/(?!)/;
-        }
-
+                if (@patterns){
+                        $re_abbr = join '|', map { "(?:$_)" } @patterns;
+                        $re_abbr = qr/\b(?:$re_abbr)\b/;
+                }
+    }
     sub expand_abbrs {
         my ($abbr, $state) = @_;
@@ -196 +194 @@
 }
 
-my $re_links;
+my $re_links = qr/(?!)/;
 
 # read links.dat, store a regex to recognize them in $re_links, and create a
@@ -214 +212 @@
             $links{$key} = encode_entities($url, ENTITIES);
         }
-        $re_links = join '|', map { "(?:$_)" } @patterns;
-        $re_links = qr/\b(?:$re_links)\b/;
-    } else {
-                # may never match
-                $re_links = qr/(?!)/;
-        }
-    sub expand_links {
+                if (@patterns){
+                        $re_links = join '|', map { "(?:$_)" } @patterns;
+                        $re_links = qr/\b(?:$re_links)\b/;
+                }
+    }     
+        
+        sub expand_links {
         my ($key, $state) = @_;
         if ($state->{$key}++) { return encode_entities($key, ENTITIES); };