projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jira to handle branch names that are just numbers
[clearscm.git]
/
maps
/
lib
/
MAPSLog.pm
diff --git
a/maps/lib/MAPSLog.pm
b/maps/lib/MAPSLog.pm
index
4a86954
..
b0b2c85
100644
(file)
--- a/
maps/lib/MAPSLog.pm
+++ b/
maps/lib/MAPSLog.pm
@@
-17,33
+17,30
@@
package MAPSLog;
use strict;
use warnings;
use strict;
use warnings;
-use
FindBin
;
+use
base qw(Exporter)
;
use MAPS;
use MAPS;
-use MAPSUtil;
-use
vars qw(@ISA @EXPORT)
;
-use
Exporter
;
+use
DateUtils
;
+use
Utils
;
-@ISA = qw (Exporter);
-
-@EXPORT = qw (
+our @ISA = qw(Exporter);
+our @EXPORT = qw (
Debug
Error
GetStats
Info
Logmsg
Debug
Error
GetStats
Info
Logmsg
- getstats
@Types
);
our @Types = (
@Types
);
our @Types = (
+ 'nulllist',
'returned',
'whitelist',
'blacklist',
'registered',
'mailloop',
'returned',
'whitelist',
'blacklist',
'registered',
'mailloop',
- 'nulllist'
);
sub nbr_msgs($) {
);
sub nbr_msgs($) {
@@
-52,16
+49,18
@@
sub nbr_msgs($) {
return FindEmail($sender);
} # nbr_msgs
return FindEmail($sender);
} # nbr_msgs
-sub GetStats(;$$) {
- my ($nbr_days, $date) = @_;
+sub GetStats(%) {
+ my (%params) = @_;
+
+ CheckParms(['userid'], \%params);
- $
nbr_days
||= 1;
- $
date ||= Today2SQLDatetime()
;
+ $
params{days}
||= 1;
+ $
params{date} ||= Today2SQLDatetime
;
my %dates;
my %dates;
- while ($
nbr_days
> 0) {
- my $ymd = substr $
date
, 0, 10;
+ while ($
params{days}
> 0) {
+ my $ymd = substr $
params{date}
, 0, 10;
my $sod = $ymd . ' 00:00:00';
my $eod = $ymd . ' 23:59:59';
my $sod = $ymd . ' 00:00:00';
my $eod = $ymd . ' 23:59:59';
@@
-70,50
+69,58
@@
sub GetStats(;$$) {
for (@Types) {
my $condition = "type=\'$_\' and (timestamp > \'$sod\' and timestamp < \'$eod\')";
for (@Types) {
my $condition = "type=\'$_\' and (timestamp > \'$sod\' and timestamp < \'$eod\')";
- # Not sure why I need to qualify countlog
- $stats{$_} = MAPS::countlog($condition);
+ $stats{$_} = MAPS::CountLogDistinct(
+ userid => $params{userid},
+ column => 'sender',
+ additional => $condition,
+ );
} # for
$dates{$ymd} = \%stats;
} # for
$dates{$ymd} = \%stats;
- $
date = SubtractDays $date
, 1;
- $
nbr_days
--;
+ $
params{date} = SubtractDays $params{date}
, 1;
+ $
params{days}
--;
} # while
return %dates
} # GetStats
} # while
return %dates
} # GetStats
-sub Logmsg(
$$$
) {
- my
($type, $sender, $msg
) = @_;
+sub Logmsg(
%
) {
+ my
(%params
) = @_;
- # Todo: Why do I need to specify MAPS:: here?
- MAPS::AddLog($type, $sender, $msg);
+ CheckParms(['userid', 'type', 'message'], \%params);
- return;
+ # TODO Why do I need to qualify this?
+ return MAPS::AddLog(%params);
} # logmsg
} # logmsg
-sub Debug(
$
) {
- my (
$msg
) = @_;
+sub Debug(
%
) {
+ my (
%params
) = @_;
- Logmsg('debug', '', $msg);
-
- return;
+ return Logmsg(
+ userid => $params{userid},
+ type => 'debug',
+ message => $params{message});
} # Debug
} # Debug
-sub Error($) {
- my ($msg) = @_;
-
- Logmsg('error', '', $msg);
+sub Error(%) {
+ my (%params) = @_;
- return;
-} # Error
+ CheckParms(['userid', 'message'], \%params);
-sub Info($) {
- my ($msg) = @_;
+ return Logmsg(
+ userid => $params{userid},
+ type => 'error',
+ message => $params{message});
+ } # Error
- Logmsg('info', '', $msg);
+sub Info(%) {
+ my (%params) = @_;
- return;
+ return Logmsg(
+ userid => $params{userid},
+ type => 'info',
+ message => $params{message});
} # info
1;
} # info
1;