X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fdetail.cgi;h=06e8bd9953d6eb0a01718caf1189822d8899d49c;hb=dbfad6be88c74de9bd715bbb673835d9a550a8d3;hp=f4885fd77053a8a9829cfbf747171462314d20b7;hpb=2911826fd83a57b69c528e4daaf8df30c00b6d2b;p=clearscm.git

diff --git a/maps/bin/detail.cgi b/maps/bin/detail.cgi
index f4885fd..06e8bd9 100755
--- a/maps/bin/detail.cgi
+++ b/maps/bin/detail.cgi
@@ -32,10 +32,11 @@ use MAPSLog;
 use MAPSWeb;
 use DateUtils;
 
-my $type   = param 'type';
-my $next   = param 'next';
-my $lines  = param 'lines';
-my $date   = param 'date';
+my $type  = param 'type';
+my $list  = substr $type, 0, -4 if $type =~ /list$/; 
+my $next  = param 'next';
+my $lines = param 'lines';
+my $date  = param 'date';
 
 $date ||= '';
 
@@ -74,6 +75,17 @@ my %types = (
   ]
 );
 
+sub formatRule($) {
+  my ($rec) = @_;
+
+  return '' unless $rec->{pattern} or $rec->{domain};
+
+  $rec->{pattern} //= '';
+  $rec->{domain}  //= '';
+
+  return "$rec->{pattern}\@$rec->{domain}";
+} # formatRule
+
 sub MakeButtons($) {
   my ($type) = @_;
 
@@ -150,6 +162,8 @@ sub Body($) {
 
   my $current = $next + 1;
 
+  my ($onlist, $rec);
+
   print div {-align => 'center'}, b (
     '(' . $current . '-' . $last . ' of ' . $total . ')');
   print start_form {
@@ -160,6 +174,8 @@ sub Body($) {
 
   MakeButtons $type;
 
+  print start_div {-id => 'highlightrow'};
+
   print start_table({-align        => 'center',
                      -id           => $table_name,
                      -border       => 0,
@@ -169,12 +185,13 @@ sub Body($) {
 
   print
     Tr [
-      td {-class  => 'tablebordertopleft'},  ' ',
-      th {-class  => 'tableborder'},         'Sender',
-      th {-class  => 'tableborder'},         'List',
-      th {-class  => 'tableborder'},         'Hit Count',
-      th {-class  => 'tableborder'},         'Rule',
-      th {-class  => 'tablebordertopright'}, 'Comment',
+      th {-class => 'tablebordertopleft'},  '',
+      th {-class => 'tableborder'},         'Sender',
+      th {-class => 'tableborder'},         'List',
+      th {-class => 'tableborder'},         'Hit Count',
+      th {-class => 'tableborder'},         'Rule',
+      th {-class => 'tableborder'},         'Retention',
+      th {-class => 'tablebordertopright'}, 'Comment/Date',
     ];
 
   my @senders = ReturnSenders(
@@ -225,40 +242,16 @@ sub Body($) {
       $heading = $msgs->[0]{subject} if $msgs->[0]{subject};
     } # if
 
-    my ($onlist, $seq);
-
-    my $rule      = 'none';
-    my $hit_count = 0;
-
-    ($onlist, $rule, $seq, $hit_count) = OnWhitelist($sender, $userid, 0);
+    ($onlist, $rec) = OnWhitelist($sender, $userid, 0);
 
     unless ($onlist) {
-      ($onlist, $rule, $seq, $hit_count) = OnBlacklist($sender, 0);
+      ($onlist, $rec) = OnBlacklist($sender, 0);
 
       unless ($onlist) {
-        ($onlist, $rule, $seq, $hit_count) = OnNulllist($sender, 0);
+        ($onlist, $rec) = OnNulllist($sender, 0);
       } # unless
     } # unless
 
-    my ($list, $sequence, $comment);
-
-    # Parse rule
-    if ($rule) {
-      if ($rule =~ /\((\w+):(\d+)\)\s+"(\S*)"/) {
-        $list     = $1;
-        $sequence = $2;
-        $rule     = $3;
-        $comment  = '';
-      } elsif ($rule =~ /\((\w+):(\d+)\)\s+"(\S*) - (.*)"/) {
-        $list     = $1;
-        $sequence = $2;
-        $rule     = $3;
-        $comment  = $4;
-      } # if
-
-      $rule =~ s/\\@/\@/;
-    } # if
-
     $next++;
 
     # Start Sender line
@@ -291,32 +284,54 @@ sub Body($) {
       -href  => "mailto:$sender$heading",
     }, " $sender";
 
-    my $listlink = ($list and $sequence) ? "$list:$sequence" : ' ';
+    if ($rec) {
+      my $listlink = ($rec->{type} and $rec->{sequence}) ? "$rec->{type}:$rec->{sequence}" : '';
+
+      $rec->{comment} //= '';
+
+      print td {
+        -class => $dataclass,
+        -align => 'right',
+      }, a {
+        href  => "/maps/php/list.php?type=$rec->{type}&next=" . ($rec->{sequence} - 1),
+      }, $listlink,
+      td {
+        -class => $dataclass,
+        -align => 'right',
+      }, "$rec->{hit_count} ",
+      td {
+        -class => $dataclass,
+      }, formatRule($rec),
+      td {
+        -class => $dataclass,
+        -align => 'right',
+      }, "$rec->{retention} ",
+      td {
+        -class => $rightclass,
+      }, $rec->{comment};
+    } else {
+      # $rec will be undefined if this message will be returned
+      print td {-class => $dataclass},
+            td {-class => $dataclass},
+            td {-class => $dataclass},
+            td {-class => $dataclass},
+            td {-class => $rightclass};
+    } # if
 
-    print td {
-      -class => $dataclass,
-      -align => 'right',
-    }, a {
-      href  => "/maps/php/list.php?type=$list&next=" . ($sequence - 1),
-    }, $listlink,
-    td {
-      -class => $dataclass,
-      -align => 'right',
-    }, "$hit_count ",
-    td {
-      -class => $dataclass,
-    }, $rule,
-    td {
-      -class => $rightclass,
-    }, $comment;
     print end_Tr;
 
+    my $msgnbr = 0;
+
     for my $rec (@$msgs) {
+      $msgnbr++;
+
       # We increased $next earlier so do not add 1 here
       if (($next % $lines) == (@senders % $lines)) {
         $dataclass    = 'tablebottomdata';
-        $rightclass   = 'tablebottomright';
-        $subjectclass = 'subjectbottom';
+        $rightclass   = 'tablebottomright' if $msgnbr == @$msgs;
+
+        # Only subjectbottom the last message
+        $subjectclass = 'subjectbottom' if $msgnbr == @$msgs;
       } # if
 
       if ($date eq substr ($rec->{timestamp}, 0, 10)) {
@@ -334,22 +349,24 @@ sub Body($) {
         Tr [
           td {
             -class   => $subjectclass,
-            -colspan => 4,
+            -colspan => 5,
           }, a {
-            -href  => "display.cgi?sender=$sender;msg_date=$rec->{timestamp}",
+            -href    => "display.cgi?sender=$sender;msg_date=$rec->{timestamp}",
            }, '    ' . $rec->{subject},
-          td {-class   => $rightclass,
-              -width   => '150',
-              -align   => 'right'}, span {-class => 'date'}, $rec->{date} . '&nbsp',
+          td {-class => $rightclass,
+              -width => '150',
+              -align => 'right'}, span {-class => 'date'}, $rec->{date} . '&nbsp',
         ];
     } # for
   } # for
 
   print end_table;
-  print end_form;
+  print end_div;
 
   MakeButtons $type;
 
+  print end_form;
+
   return;
 } # Body
 
@@ -388,8 +405,10 @@ if ($date eq '') {
   $condition .= "type = '$type' and timestamp > '$sod' and timestamp < '$eod'";
 } # if
 
-$total = CountLog(
+# Need to count distinct on sender
+$total = CountLogDistinct(
   userid     => $userid,
+  column     => 'sender',
   additional => $condition,
 );