Changeset 2096 for trunk/gsdl/perllib/plugins/EMAILPlug.pm

Timestamp:

2001-03-01T13:44:42+13:00 (23 years ago)

Author:

jrm21

Message:

Minor changes to regexs, so that header fields have to be at start of line.
(eg /From:/ -> /^{From:/m). Also changed file extension so that we process
files named with either a number (maildir) or .mbx (mbox). For now, .email
is also recognised...}

File:

• trunk/gsdl/perllib/plugins/EMAILPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -32 +32 @@
 #
 # Email plug reads email files.  These are named with a simple
-# number (i.e. as they appear in mh_mail folders) or with the 
-# extension .email
+# number (i.e. as they appear in maildir folders) or with the 
+# extension .mbx (for mbox mail file format)
 #
 # Document text:
@@ -74 +74 @@
 sub get_default_process_exp {
     my $self = shift (@_);
-
-    return q^\d+(\.email)?$^;
+    # mbx/email for mailbox file format, \d+ for maildir (each message is
+    # in a separate file, with a unique number for filename)
+    return q@[\\/]\d+|\.(mbx|email)$@;
 }
 
 # This plugin splits the mbox mail files at lines starting with From<sp>
 sub get_default_split_exp {
-    return q^From .*\n^;
+    return q^\nFrom .*\n^;
 }
 
@@ -91 +92 @@
 
     # Check that we're dealing with a valid mail file
-    return undef unless (($$textref =~ /From:/) || ($$textref =~ /To:/));
+    return undef unless (($$textref =~ /^From:/m) || ($$textref =~ /^To:/m));
 
     # slightly more strict validity check, to prevent us from matching 
     # .so.x files ...
     return undef unless (($$textref =~ /^From /) ||
-             ($$textref =~ /^[-A-Za-z]{2,100}:/));
+             ($$textref =~ /^[-A-Za-z]{2,100}:/m));
 
     print $outhandle "EMAILPlug: processing $file\n"