Bug fixes for mapsscrub.pl

diff --git a/maps/bin/mapsscrub.pl b/maps/bin/mapsscrub.pl
index 06ea1d7..d50b70f 100755 (executable)
--- a/maps/bin/mapsscrub.pl
+++ b/maps/bin/mapsscrub.pl
@@ -64,7 +64,7 @@ my %opts = (
   optimize => 1,
 );
 
-my ($userid, $log, %total);
+my ($log, %total);
 
 sub CleanUp($) {
   my ($userid) = @_;
@@ -73,14 +73,15 @@ sub CleanUp($) {
 
   my $timestamp = SubtractDays(Today2SQLDatetime, $options{History});
 
-  $total{'Emails cleaned'}      = CleanEmail $timestamp;
-  $total{'Log entries removed'} = CleanLog   $timestamp;
+  $total{'Emails cleaned'}      = CleanEmail $timestamp, $opts{dryrun};
+  $total{'Log entries removed'} = CleanLog   $timestamp, $opts{dryrun};
 
   for (qw(white black null)) {
     $total{"${_}list entries removed"} = CleanList(
       userid => $userid,
       type   => $_,
       log    => $log,
+      dryrun => $opts{dryrun},
     );
   } # for
 
@@ -98,6 +99,7 @@ GetOptions(
   'debug',
   'userid=s',
   'optimize!',
+  'dryrun',
 ) or pod2usage;
 
 $log = Logger->new(
@@ -107,8 +109,6 @@ $log = Logger->new(
 
 FindUser(%opts{userid});
 
-#$~ = "REPORT" if $verbose;
-
 while (my $rec = GetUser) {
   SetContext($rec->{userid});
 

diff --git a/maps/lib/MAPS.pm b/maps/lib/MAPS.pm
index c2069c1..e679d00 100644 (file)
--- a/maps/lib/MAPS.pm
+++ b/maps/lib/MAPS.pm
@@ -570,9 +570,9 @@ sub CleanList(%) {
                                   .  "$rec->{pattern}\@$rec->{domain} $dryrunstr");
           $params{log}->dbug("last hit = $rec->{last_hit} < agedDate = $agedDate");
         } # if
-
-        $count++;
       } # unless
+
+      $count++;
     } else {
       $params{log}->dbug("$rec->{userid}:$params{type}:$rec->{sequence}: nodelete $dryrunstr "
                        . "last hit = $rec->{last_hit} >= agedDate = $agedDate")