handle article subject specilly where the key in db is "article_subject".

1 files changed, 8 insertions, 5 deletions

diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm
index b8be0801..8f1fcb1d 100644
--- a/fml/lib/Mail/Message/ToHTML.pm
+++ b/fml/lib/Mail/Message/ToHTML.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: ToHTML.pm,v 1.54 2003/08/24 14:01:12 fukachan Exp $
+# $FML: ToHTML.pm,v 1.55 2003/09/08 09:21:51 fukachan Exp $
 #
 
 package Mail::Message::ToHTML;
@@ -17,7 +17,7 @@ my $debug = 0;
 my $URL   =
     "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>";
 
-my $version = q$FML: ToHTML.pm,v 1.54 2003/08/24 14:01:12 fukachan Exp $;
+my $version = q$FML: ToHTML.pm,v 1.55 2003/09/08 09:21:51 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) {
     $version = "$URL $1";
 }
@@ -490,7 +490,8 @@ sub html_begin
     elsif (defined $args->{ message }) {
 	$msg   = $args->{ message };
 	$hdr   = $msg->whole_message_header;
-	$title = $self->_decode_mime_string( $hdr->get('subject') );
+	$title = $self->_decode_mime_string( $hdr->get('article_subject') || 
+					$hdr->get('subject') );
     }
 
     print $wh
@@ -590,12 +591,13 @@ sub _set_output_channel
 {
     my ($self, $args) = @_;
     my $dst = $args->{ dst };
-    my $wh;
+    my $wh  = undef;
 
     my $mask = umask();
     umask(022);
 
     if (defined $dst) {
+	use FileHandle;
 	$wh = new FileHandle "> $dst";
     }
     else {
@@ -1976,7 +1978,8 @@ sub _print_li_filename
 {
     my ($self, $wh, $db, $id, $code) = @_;
     my $filename = $db->get('html_filename', $id);
-    my $subject  = $db->get('subject', $id) || "no subject";
+    my $subject  = $db->get('article_subject', $id) || 
+			$db->get('subject', $id) || "no subject";
     my $who      = $db->get('who', $id) || "no sender";
 
     _PRINT_DEBUG("-- print_li_filename id=$id file=$filename");