X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fmapsutil.pl;h=fba892bb7677f13dfb9fa14e90a1571ad5cb41db;hb=d3c598399f93a1ca4ffc9f4aedd7907f4157ca43;hp=be9da97d48f9607c97a01235c4498c74ef89e2ac;hpb=dd45f3430c6ce7ad0633e2a7989c120372ef0b6f;p=clearscm.git

diff --git a/maps/bin/mapsutil.pl b/maps/bin/mapsutil.pl
index be9da97..fba892b 100755
--- a/maps/bin/mapsutil.pl
+++ b/maps/bin/mapsutil.pl
@@ -203,7 +203,10 @@ sub LoadListFile($) {
 
   my $sequence = 0;
 
-  Info("Adding $listfilename to $listtype list");
+  Info(
+    userid  => $userid,
+    message => "Adding $listfilename to $listtype list",
+  );
 
   while ($listfile) {
     chomp;
@@ -253,18 +256,21 @@ sub LoadEmail($) {
       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) {
-    say "No messages found to load";
+    print "No messages found to load";
   } elsif ($nbr_msgs == 1) {
-    say "Loaded 1 message";
+    print "Loaded 1 message";
   } else {
-    say "Loaded $nbr_msgs messages";
+    print "Loaded $nbr_msgs messages";
   } # if
 
-  say "from $file";
+  say " from $filename";
 } # LoadEmail
 
 sub DumpEmail($) {
@@ -368,10 +374,11 @@ $~ = "USERLIST";
 } # ShowUsers
 
 sub ShowEmail() {
+  my @fields = qw(userid timestamp sender subject);
   my ($err, $msg) = $MAPS::db->find(
     'email',
     "userid='$userid'",
-    qw(userid timestamp sender subject),
+    \@fields,
   );
 
 my ($timestamp, $sender, $subject);
@@ -385,9 +392,9 @@ $~ = "EMAIL";
   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