projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://github.com/adefaria/clearscm
[clearscm.git]
/
maps
/
bin
/
mapsutil.pl
diff --git
a/maps/bin/mapsutil.pl
b/maps/bin/mapsutil.pl
index
be9da97
..
fba892b
100755
(executable)
--- a/
maps/bin/mapsutil.pl
+++ b/
maps/bin/mapsutil.pl
@@
-203,7
+203,10
@@
sub LoadListFile($) {
my $sequence = 0;
my $sequence = 0;
- Info("Adding $listfilename to $listtype list");
+ Info(
+ userid => $userid,
+ message => "Adding $listfilename to $listtype list",
+ );
while ($listfile) {
chomp;
while ($listfile) {
chomp;
@@
-253,18
+256,21
@@
sub LoadEmail($) {
data => $msgInfo{data},
);
data => $msgInfo{data},
);
- Info("Added message from $msgInfo{sender} to email");
+ Info(
+ userid => $userid,
+ message => "Added message from $msgInfo{sender} to email"
+ );
} # while
if ($nbr_msgs == 0) {
} # while
if ($nbr_msgs == 0) {
-
say
"No messages found to load";
+
print
"No messages found to load";
} elsif ($nbr_msgs == 1) {
} elsif ($nbr_msgs == 1) {
-
say
"Loaded 1 message";
+
print
"Loaded 1 message";
} else {
} else {
-
say
"Loaded $nbr_msgs messages";
+
print
"Loaded $nbr_msgs messages";
} # if
} # if
- say "
from $fil
e";
+ say "
from $filenam
e";
} # LoadEmail
sub DumpEmail($) {
} # LoadEmail
sub DumpEmail($) {
@@
-368,10
+374,11
@@
$~ = "USERLIST";
} # ShowUsers
sub ShowEmail() {
} # ShowUsers
sub ShowEmail() {
+ my @fields = qw(userid timestamp sender subject);
my ($err, $msg) = $MAPS::db->find(
'email',
"userid='$userid'",
my ($err, $msg) = $MAPS::db->find(
'email',
"userid='$userid'",
-
qw(userid timestamp sender subject)
,
+
\@fields
,
);
my ($timestamp, $sender, $subject);
);
my ($timestamp, $sender, $subject);
@@
-385,9
+392,9
@@
$~ = "EMAIL";
while (my $rec = $MAPS::db->getnext) {
last unless $rec->{userid};
while (my $rec = $MAPS::db->getnext) {
last unless $rec->{userid};
- $timestamp = $rec->{timestamp};
- $sender = $rec->{sender};
- $subject = $rec->{subject};
+ $timestamp = $rec->{timestamp}
|| '<undef>'
;
+ $sender = $rec->{sender}
|| '<undef>'
;
+ $subject = $rec->{subject}
|| '<undef>'
;
write();
} # while
write();
} # while