svn commit: r497857 - /spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi

[jm...@apache.org]

Author: jm
Date: Fri Jan 19 08:10:58 2007
New Revision: 497857

URL: http://svn.apache.org/viewvc?view=rev&rev=497857
Log:
um, try that again

Modified:
    spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi

Modified: spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi?view=diff&rev=497857&r1=497856&r2=497857
==============================================================================
--- spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/trunk/masses/rule-qa/automc/ruleqa.cgi Fri Jan 19 08:10:58 2007
@@ -182,8 +182,7 @@
       $self->{q}->param('daterev', $self->{daterev});  # make it absolute
     }
     elsif ($self->{daterev} eq 'last-preflight') {
-      $self->{daterev} = $self->date_in_direction('', 0);
-      $self->{q}->param('daterev', $self->{daterev});  # make it absolute
+      $self->{daterev} = undef;
     }
     elsif ($self->{daterev} eq 'today') {
       $self->{daterev} = $self->get_daterev_by_date(
@@ -195,17 +194,16 @@
       $self->{daterev} = $self->get_daterev_by_date($1);
       $self->{q}->param('daterev', $self->{daterev});  # make it absolute
     }
-    else {
-      if ($self->{daterev} =~ /(\d+)[\/-](r\d+)-(\S+)/ && $2) {
-        $self->{daterev} = "$1-$2-$3";
-      } else {
-        $self->{daterev} = undef;
-      }
+    elsif ($self->{daterev} =~ /(\d+)[\/-](r\d+)-(\S+)/ && $2) {
+      $self->{daterev} = "$1-$2-$3";
+    } else {
+      # default: last-night's
+      $self->{daterev} = $self->get_last_night_daterev();
     }
   }
 
   # turn possibly-empty $self->{daterev} into a real date/rev combo (that exists)
-  $self->{daterev} = $self->get_last_night_daterev();
+  $self->{daterev} = $self->date_in_direction($self->{daterev}, 0);
 
   $self->{daterev_md} = $self->get_daterev_metadata($self->{daterev});
 }