X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=10b386383f6c4f104dd5d597c09c856e8b5c8ac0;hp=7e62447147c7d468d8bb0ad8c3ba2e481230f352;hb=6912944a9959e4046b095fbd378f5545c2caca9e;hpb=b09958bc22d82835c95967c03f8e3f4b79ba6e8f

diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index 7e6244714..10b386383 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -1,53 +1,16 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                'title' => $title,
                'name'  => 'call detail records',
-
-               'query' => { 'table'     => 'cdr',
-                            'hashref'   => $hashref,
-			    'extra_sql' => $qsearch,
-			    'order_by'  => 'ORDER BY calldate',
-                          },
+               'query' => $query,
                'count_query' => $count_query,
-               'count_addl' => [ $totalminutes_sub ],
-               'header' => [
-                             '', # checkbox column
-                             @header,
-                           ],
-               'fields' => [
-                             sub {
-                               return '' unless $edit_data;
-                               $areboxes = 1;
-                               my $cdr = shift;
-                               my $acctid = $cdr->acctid;
-                               qq!<INPUT NAME="acctid$acctid" TYPE="checkbox" VALUE="1">!;
-                             },
-                             @fields,       #XXX fill in some pretty-print
-                                            #processing, etc.
-                           ],
+               'count_addl' => $nototalminutes ? '' : [ $totalminutes_sub ],
+               'disable_total' => $topmode ? 1 : '',
+               'header' => \@header,
+               'fields' => \@fields,
                'links' => \@links,
-
                'html_form'   => qq!<FORM NAME="cdrForm" ACTION="$p/misc/cdr.cgi" METHOD="POST">!,
-               #false laziness w/queue.html
-               'html_foot' => sub {
-                                if ( $areboxes ) {
-                                  '<BR><INPUT TYPE="button" VALUE="select all" onClick="setAll(true)">'.
-                                  '<INPUT TYPE="button" VALUE="unselect all" onClick="setAll(false)">'.
-                                  qq!<BR><INPUT TYPE="submit" NAME="action" VALUE="reprocess selected" onClick="return confirm('Are you sure you want to reprocess the selected CDRs?')">!.
-                                  qq!<INPUT TYPE="submit" NAME="action" VALUE="delete selected" onClick="return confirm('Are you sure you want to delete the selected CDRs?')"><BR>!.
-                                  '<SCRIPT TYPE="text/javascript">'.
-                                  '  function setAll(setTo) { '.
-                                  '    theForm = document.cdrForm;'.
-                                  '    for (i=0,n=theForm.elements.length;i<n;i++)'.
-                                  '      if (theForm.elements[i].name.indexOf("acctid") != -1)'.
-                                  '        theForm.elements[i].checked = setTo;'.
-                                  '  }'.
-                                  '</SCRIPT>';
-                                } else {
-                                  '';
-                                }
-                              },
-             )
-%>
+               'html_foot' => $html_foot,
+&>
 <%init>
 
 die "access denied"
@@ -62,8 +25,6 @@ my $totalminutes_sub = sub {
 
 my $conf = new FS::Conf;
 
-my $areboxes = 0;
-
 my $title = 'Call Detail Records';
 my $hashref = {};
 
@@ -98,21 +59,40 @@ my @qsearch = @search;
 # freesidestatus
 ###
 
-if ( $cgi->param('freesidestatus') eq 'NULL' ) {
+my $status = $cgi->param('freesidestatus');
+if ( $status eq 'NULL' ) {
 
   $title = "Unprocessed $title";
   $hashref->{'freesidestatus'} = ''; # Record.pm will take care of it
   push @search, "( freesidestatus IS NULL OR freesidestatus = '' )";
 
-} elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) {
-
-  $title = "Processed $title";
+} elsif ( $status =~ /^([\w ]+)$/ ) {
+  
+  if ( $status eq 'done' ) {
+    $title = "Processed $title";
+  }
+  elsif ( $status eq 'failed' ) {
+    $title = "Skipped $title";
+  }
   $hashref->{'freesidestatus'} = $1;
   push @search, "freesidestatus = '$1'";
 
 }
 
 ###
+# cdrtypenum
+###
+
+if ( $cgi->param('cdrtypenum') =~ /^(\d+)$/ ) {
+    $hashref->{'cdrtypenum'} = $1;
+    push @search, "cdrtypenum = $1";
+}
+elsif ( $cgi->param('cdrtypenum') eq 'none' ) {
+    $hashref->{'cdrtypenum'} = '';
+    push @search, "cdrtypenum is null";
+}
+
+###
 # termpartNstatus
 ###
 
@@ -222,6 +202,17 @@ if ( $cgi->param('svcnum') =~ /^([\d, ]+)$/ ) {
 }
 
 ###
+# src/dst_ip_addr
+###
+foreach my $field ('src_ip_addr','dst_ip_addr') {
+  if ( $cgi->param($field) ) {
+    my $search = FS::cdr->ip_addr_sql($field, $cgi->param($field));
+    push @search, $search;
+    push @qsearch, $search;
+  }
+}
+
+###
 # cdrbatchnum (or legacy cdrbatch)
 ###
 
@@ -267,9 +258,30 @@ if ( $cgi->param('acctid') =~ /\d/ ) {
 }
 
 ###
+# accountcode
+###
+
+if ( $cgi->param('accountcode') =~ /\S/ ) {
+  my $accountcode = $cgi->param('accountcode');
+  my @accountcode = map {
+    ( my $v = $_ ) =~ s/^\s+|\s+$//g;
+    if ( $v =~ /'/ ) { $v =~ s/'/\\'/g; $v = "E'$v'" }
+    elsif ( length $v ) { $v = "'$v'" }
+    length $v ? $v : ()
+  } grep /\S/, split /\R/, $accountcode;
+  if (@accountcode) {
+    my $search = 'accountcode IN ( ' . join( ',', @accountcode ) . ' )';
+    push @qsearch, $search;
+    push @search,  $search;
+  }
+}
+
+###
 # finish it up
 ###
 
+my $nototalminutes = 0;
+
 my $search = join(' AND ', @search);
 $search = "WHERE $search" if $search;
 
@@ -279,6 +291,20 @@ my $qsearch = join(' AND ', @qsearch);
 $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch
   if $qsearch;
 
+my $query =     {   'table'     => 'cdr',
+                    'hashref'   => $hashref,
+			        'extra_sql' => $qsearch,
+			        'order_by'  => 'ORDER BY calldate',
+                };
+
+if ( $cgi->param('longest') =~ /^(\d+)$/ && $cgi->param('longest') > 0 ) {
+    $cgi->param('maxrecords',$1);
+    $count_query = "SELECT $1";
+    $query->{'order_by'} = 'ORDER BY billsec desc';
+    $nototalminutes = 1;
+}
+
+
 ###
 # display fields
 ###
@@ -303,6 +329,7 @@ my @header = map {
                      ucfirst($header);
                    }
                  } @fields;
+unshift @header, ' ';
 
 my $date_sub_factory = sub {
   my $column = shift;
@@ -324,8 +351,69 @@ my %links = (
 );
 
 @fields = map { exists($fields{$_}) ? $fields{$_} : $_ } @fields;
+unshift @fields, sub {
+                       return '' unless $edit_data;
+                       my $cdr = shift;
+                       my $acctid = $cdr->acctid;
+                       qq!<INPUT NAME="acctid$acctid" TYPE="checkbox" VALUE="1">!;
+                     };
+
+my @links = ( map { exists($links{$_}) ? $links{$_} : '' } @fields );
 
-              #checkbox column
-my @links = ( '', map { exists($links{$_}) ? $links{$_} : '' } @fields );
 
+###
+# top dst / top src
+###
+
+my $topmode = 0;
+
+if ( $cgi->param('top_dst') =~ /^(\d+)$/ && $cgi->param('top_dst') > 0 ) {
+        $topmode = $1;
+        @fields = ('dst');
+        @header = ('Destination');
+}
+elsif ( $cgi->param('top_src') =~ /^(\d+)$/ && $cgi->param('top_src') > 0 ) {
+        $topmode = $1;
+        @fields = ('src');
+        @header = ('Source');
+}
+
+if ( $topmode ) {
+    my $whichfield = $fields[0];
+    $query = {  'select'    => "$whichfield, count(1) as cnt",
+                'table'     => 'cdr',
+                'hashref'   => {},
+                'extra_sql' => "$search
+                                group by $whichfield
+                                order by cnt desc",
+             };
+    $count_query = "SELECT $topmode";
+
+    # this is weird, maybe we should change search.html
+    $cgi->param('maxrecords',$topmode);
+    
+    # kind of hacked
+    my $link = "${p}search/cdr.html?".$cgi->query_string;
+    $link =~ s/;top_(dst|src)=(\d+|)//g;
+    $link =~ s/;maxrecords=(\d+|)//;
+    $link =~ s/;(src|dst)=(\d+|)//g;
+    $link = [ "$link;$whichfield=", sub { shift->$whichfield } ];
+    @links = ($link);
+
+    push @fields, 'cnt';
+    push @header, '# Calls';
+    
+    $nototalminutes = 1;
+}
+
+my $html_foot = include('/search/elements/checkbox-foot.html',
+  actions => [
+    { submit  => "reprocess selected",
+      name    => "action",
+      confirm => "Are you sure you want to reprocess the selected CDRs?" },
+    { submit  => "delete selected",
+      name    => "action",
+      confirm => "Are you sure you want to delete the selected CDRs?" },
+  ]
+);
 </%init>