svn commit: r481716 - in /spamassassin/trunk: lib/Mail/SpamAssassin/ArchiveIterator.pm masses/mass-check sa-learn.raw

[fe...@apache.org]

Author: felicity
Date: Sat Dec  2 20:33:01 2006
New Revision: 481716

URL: http://svn.apache.org/viewvc?view=rev&rev=481716
Log:
have to set opt_want_date as appropriate now since opt_n is gone from AI

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
    spamassassin/trunk/masses/mass-check
    spamassassin/trunk/sa-learn.raw

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?view=diff&rev=481716&r1=481715&r2=481716
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Sat Dec  2 20:33:01 2006
@@ -176,8 +176,8 @@
   bless ($self, $class);
 
   # If any of these options are set, we need to figure out the message's
-  # receive date at scan time.  opt_n == 0, opt_after, opt_before
-  $self->{determine_receive_date} = !$self->{opt_n} ||
+  # receive date at scan time.  opt_after, opt_before, or opt_want_date
+  $self->{determine_receive_date} = 
   	defined $self->{opt_after} || defined $self->{opt_before} ||
         $self->{opt_want_date};
 
@@ -547,13 +547,14 @@
 sub message_is_useful_by_date {
   my ($self, $date) = @_;
 
-  return 0 unless $date;	# undef or 0 date = unusable
-
   if (!$self->{opt_after} && !$self->{opt_before}) {
     # Not using the feature
     return 1;
   }
-  elsif (!$self->{opt_before}) {
+
+  return 0 unless $date;	# undef or 0 date = unusable
+
+  if (!$self->{opt_before}) {
     # Just care about after
     return $date > $self->{opt_after};
   }

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?view=diff&rev=481716&r1=481715&r2=481716
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Sat Dec  2 20:33:01 2006
@@ -329,6 +329,7 @@
   $AIopts->{'opt_after'} = $opt_after;
   $AIopts->{'opt_before'} = $opt_before;
   $AIopts->{'scan_progress_sub'} = \&showdots_blip;
+  $AIopts->{'opt_want_date'} = ! $opt_n;
 
   # ensure that scanprob stuff is predictable and reproducable
   if (defined $opt_scanprob && $opt_scanprob < 1.0) {
@@ -338,6 +339,7 @@
 else {
   # ArchiveIterator options for client mode -- tends to be simple
   $opt_n = 1;
+  $AIopts->{'opt_want_date'} = 0;
 }
 
 ###########################################################################

Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?view=diff&rev=481716&r1=481715&r2=481716
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Sat Dec  2 20:33:01 2006
@@ -407,6 +407,7 @@
   my $iter = new Mail::SpamAssassin::ArchiveIterator(
     {
       'opt_all' => 0,       # skip messages over 250k
+      'opt_want_date' => 0,
     }
   );