svn commit: rev 6711 - in incubator/spamassassin/trunk: . lib/Mail/SpamAssassin masses spamd

[fe...@apache.org]

Author: felicity
Date: Tue Feb 17 13:25:31 2004
New Revision: 6711

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
   incubator/spamassassin/trunk/masses/mass-check
   incubator/spamassassin/trunk/spamassassin.raw
   incubator/spamassassin/trunk/spamd/spamd.raw
Log:
rewrite_mail() now just returns a scalar with the rewritten message instead of a fully parsed object

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Tue Feb 17 13:25:31 2004
@@ -543,8 +543,8 @@
 =item $status->rewrite_mail ()
 
 Rewrite the mail message.  This will at minimum add headers, and at
-maximum MIME-encapsulate the message text, to reflect its spam or
-not-spam status.
+maximum MIME-encapsulate the message text, to reflect its spam or not-spam
+status.  The function will return a scalar of the rewritten message.
 
 The actual modifications depend on the configuration (see
 C<Mail::SpamAssassin::Conf> for more information).
@@ -745,10 +745,8 @@
 
 EOM
   
-  my $mbox = $self->{msg}->get_mbox_seperator();
-  $newmsg = $mbox . $newmsg if ( defined $mbox );
-  my @lines = split (/^/m,  $newmsg);
-  return Mail::SpamAssassin::MsgParser->parse(\@lines);
+  my $mbox = $self->{msg}->get_mbox_seperator() || '';
+  return $mbox . $newmsg;
 }
 
 sub rewrite_headers {
@@ -789,10 +787,8 @@
     push(@pristine_headers, "X-Spam-$header: $line\n");
   }
 
-  my $mbox = $self->{msg}->get_mbox_seperator();
-  splice @pristine_headers, 0, 0, $mbox if ( defined $mbox );
-  push(@pristine_headers, "\n", split (/^/m, $self->{msg}->get_pristine_body()));
-  return Mail::SpamAssassin::MsgParser->parse(\@pristine_headers);
+  my $mbox = $self->{msg}->get_mbox_seperator() || '';
+  return join('', $mbox, @pristine_headers, "\n", $self->{msg}->get_pristine_body());
 }
 
 sub _process_header {

Modified: incubator/spamassassin/trunk/masses/mass-check
==============================================================================
--- incubator/spamassassin/trunk/masses/mass-check	(original)
+++ incubator/spamassassin/trunk/masses/mass-check	Tue Feb 17 13:25:31 2004
@@ -281,9 +281,8 @@
   my $extra = join(",", @extra);
 
   if (defined $opt_rewrite) {
-    my $mail = $status->rewrite_mail();
     open(REWRITE, "> " . ($opt_rewrite ? $opt_rewrite : "/tmp/out"));
-    print REWRITE $mail->get_pristine();
+    print REWRITE $status->rewrite_mail();
     close(REWRITE);
   }
 

Modified: incubator/spamassassin/trunk/spamassassin.raw
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.raw	(original)
+++ incubator/spamassassin/trunk/spamassassin.raw	Tue Feb 17 13:25:31 2004
@@ -235,9 +235,7 @@
   # not reporting? OK, do checks instead.  Create a status object which
   # holds details of the message's spam/not-spam status.
   my $status = $spamtest->check ($mail);
-  $mail = $status->rewrite_mail ();
-
-  print $mail->get_pristine();
+  print $status->rewrite_mail ();
 
   if ($opt{'test-mode'}) {
     print $status->get_report();

Modified: incubator/spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamd.raw	(original)
+++ incubator/spamassassin/trunk/spamd/spamd.raw	Tue Feb 17 13:25:31 2004
@@ -915,10 +915,8 @@
     my $spamhdr = "Spam: $response_spam_status ; $msg_score / $msg_threshold";
 
     if ($method eq 'PROCESS') {
-	$mail = $status->rewrite_mail; #if $status->is_spam;
-
         # Build the message to send back and measure it
-        my $msg_resp = $mail->get_pristine();
+        my $msg_resp = $status->rewrite_mail();
         my $msg_resp_length = length($msg_resp);
         if($version >= 1.3) # Spamc protocol 1.3 means multi hdrs are OK
         {