Changeset 3136

Timestamp:

2002-06-07T12:25:02+12:00 (22 years ago)

Author:

paynter

Message:

Reconciled John's version of my changes to EMAILPlug with my version
of my changes. It turns out they differed only in formatting and
documentation.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -175 +175 @@
     @parts = split(/:/, $line);
     $name = shift @parts;
-# get fieldname in canonical form - first cap, then lower case.
+        # get fieldname in canonical form - first cap, then lower case.
     $name =~ tr/A-Z/a-z/;
-# uppercase the first character according to the current locale
+        # uppercase the first character according to the current locale
     $name=~s/(.+)/\u$1/;
     next unless $name;
@@ -220 +220 @@
           $value=original_value;
         }
-    } else { # end of if =?...?=
+        } # end of if =?...?=
+
+        # In the absense of other charset information, assume the
+        # header is the default (usually "iso_8859_1") and convert it to unicode.
+        else {
         $self->convert2unicode($default_header_encoding, \$value);
     }
-
-
     
     # Store the metadata
@@ -659 +661 @@
 sub text_from_part {
     my $self = shift;
-    my $text=shift || '';
-    my $part_header=$text;
+    my $text = shift || '';
+    my $part_header = $text;
+
     # check for empty part header (leading blank line)
     if ($text =~ /^\s*\r?\n/) {