projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug with counting messages
[clearscm.git]
/
maps
/
lib
/
MAPS.pm
diff --git
a/maps/lib/MAPS.pm
b/maps/lib/MAPS.pm
index
e679d00
..
618fb67
100644
(file)
--- a/
maps/lib/MAPS.pm
+++ b/
maps/lib/MAPS.pm
@@
-106,14
+106,14
@@
my $mapsbase = "$FindBin::Bin/..";
sub _cleanTables($$;$) {
my ($table, $timestamp, $dryrun) = @_;
sub _cleanTables($$;$) {
my ($table, $timestamp, $dryrun) = @_;
- my $count = 0;
- my $msg = 'Records deleted';
my $condition = "userid = '$userid' and timestamp < '$timestamp'";
if ($dryrun) {
return $db->count($table, $condition);
} else {
my $condition = "userid = '$userid' and timestamp < '$timestamp'";
if ($dryrun) {
return $db->count($table, $condition);
} else {
- return $db->delete($table, $condition);
+ my ($count, $msg) = $db->delete($table, $condition);
+
+ return $count;
} # if
} # _cleanTables
} # if
} # _cleanTables
@@
-291,7
+291,7
@@
sub AddList(%) {
$rec{hit_count} //= $db->count(
'email',
$rec{hit_count} //= $db->count(
'email',
- "userid = '$rec{userid}' and sender like '$rec{sender}%'"
+ "userid = '$rec{userid}' and sender like '
%
$rec{sender}%'"
);
($rec{pattern}, $rec{domain}) = split /\@/, delete $rec{sender};
);
($rec{pattern}, $rec{domain}) = split /\@/, delete $rec{sender};
@@
-500,6
+500,7
@@
sub CleanList(%) {
my $table = 'list';
my $condition = "userid='$params{userid}' and type='$params{type}'";
my $count = 0;
my $table = 'list';
my $condition = "userid='$params{userid}' and type='$params{type}'";
my $count = 0;
+ my $msg;
# First let's go through the list to see if we have an domain level entry
# (e.g. @spammer.com) and also individual entries (baddude@spammer.com) then
# First let's go through the list to see if we have an domain level entry
# (e.g. @spammer.com) and also individual entries (baddude@spammer.com) then
@@
-536,11
+537,14
@@
sub CleanList(%) {
} # for
} # while
} # for
} # while
- my $msg = 'Records deleted';
$condition = "userid='$params{userid}' and type='$params{type}' and retention is not null";
# First see if anything needs to be deleted
$condition = "userid='$params{userid}' and type='$params{type}' and retention is not null";
# First see if anything needs to be deleted
- return (0, $msg) unless $db->count($table, $condition);
+ ($count, $msg) = $db->count($table, $condition);
+
+ return 0 unless $count;
+
+ $count = 0;
my ($err, $errmsg) = $db->find($table, $condition);
my ($err, $errmsg) = $db->find($table, $condition);
@@
-583,9
+587,9
@@
sub CleanList(%) {
ResequenceList(
userid => $params{userid},
type => $params{type},
ResequenceList(
userid => $params{userid},
type => $params{type},
- ) if $count
and
!$params{dryrun};
+ ) if $count
&&
!$params{dryrun};
- return
wantarray ? ($count, $msg) : $count;
+ return
$count;
} # CleanList
sub CountEmail(%) {
} # CleanList
sub CountEmail(%) {
@@
-1009,7
+1013,7
@@
sub ResequenceList(%) {
$db->lock('write', $table);
# Get all records for $userid and $type
$db->lock('write', $table);
# Get all records for $userid and $type
- my $listrecs = $db->get($table, $condition);
+ my $listrecs = $db->get($table, $condition
,'*', 'order by hit_count desc'
);
# Delete all of the list entries for this $userid and $type
my ($count, $msg) = $db->delete($table, $condition);
# Delete all of the list entries for this $userid and $type
my ($count, $msg) = $db->delete($table, $condition);