Changeset 1658

Timestamp:

2000-11-08T11:49:49+13:00 (23 years ago)

Author:

paynter

Message:

Fixed a bug reading the headers that confused "To" with "In-Reply-To".

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -46 +46 @@
 #   $DateText     Date: header
 #   $Date         Date: header in GSDL format (eg: 19990924)
-#
-# Version history
-#
-# 1.2   (2000 Jun 12) Major rewrite.
-#       (The new version of Greenstone breaks some of the metadata.)
-# 1.1.1 Compensated for two-digit years like "95"
-# 1.1   (1999 Sep 20) Introduced the various metadata fileds
-# 1.0   Based on the original HTMLPlug code
-#
-
 
 package EMAILPlug;
@@ -112 +102 @@
     # Extract basic metadata from header
     my @headers = ("From", "To", "Subject", "Date");
-    my $value = ""; 
     my %raw;
-
     foreach my $name (@headers) {
-    $value = $Headers; 
-    $value =~ s/.*$name://s;
-    $value =~ s/\S*:.*//s;
-    $value =~ s/\s*$//;
-    $value =~ s/\s+/ /g;
+    $raw{$name} = "No $name value";
+    }
+
+    # Examine each line of the headers
+    my ($line, $name, $value);
+    my @parts;
+    foreach $line (split(/\n/, $Headers)) {
+    
+    # Ignore lines with no content or which begin with whitespace
+    next unless ($line =~ /:/);
+    next if ($line =~ /^\s/);
+
+    # Find out what metadata is on this line
+    @parts = split(/:/, $line);
+    $name = shift @parts;
+    next unless $name;
+    next unless ($raw{$name});
+
+    # Find the value of that metadata
+    $value = join(":", @parts);
+    $value =~ s/^\s+//;
+    $value =~ s/\s+$//;
+
+    # Store the metadata
     $raw{$name} = $value;
     }
 
     # Process Date information
-    if ($raw{"Date"}) {
+    if ($raw{"Date"} !~ /No Date/) {
     $raw{"DateText"} = $raw{"Date"};