[freeside-commits] freeside/httemplate/search phone_inventory_provisioned.html, 1.5, 1.6

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv6933/httemplate/search

Modified Files:
	phone_inventory_provisioned.html 
Log Message:
improve performance of DID provisioning status report, RT10988

Index: phone_inventory_provisioned.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/phone_inventory_provisioned.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- phone_inventory_provisioned.html	21 Jun 2011 22:59:01 -0000	1.5
+++ phone_inventory_provisioned.html	21 Jun 2011 23:27:58 -0000	1.6
@@ -14,41 +14,48 @@
                                  ],
               'fields'        => [
         sub { # LATA
-            my $did_order = shift;
-            my $lata = $did_order->lata;
+            my $phone_avail = shift;
+            my $lata = $phone_avail->lata;
             $lata = $lata ? $lata->description : '';
-            $did_order->latanum . " - " . $lata;
+            $phone_avail->latanum . " - " . $lata;
         },
 		sub { # Available
 		    my $latanum = shift->latanum;
-		    my @dids = qsearch('phone_avail',
+		    my $cnt = qsearchs({ 'table'    => 'phone_avail',
+                                 'hashref'  => 
                                     { 'svcnum' => '',
                                       'latanum' => $latanum,
-                                    }
-                          );
-		    return scalar(@dids);
+                                    },
+                                 'select'   => 'count(1) as cnt',
+                          });
+		    ($cnt) ? $cnt->cnt : '';
 		},
 		sub { # Provisioned
 		    my $latanum = shift->latanum;
-		    my @dids = provisioned_dids($latanum);
-		    return scalar(@dids);
+            my $cnt = qsearchs({   'table'     => 'phone_avail',
+                        'hashref'   => { 'latanum' => $latanum,
+                                         'svcnum' => { op => '>',
+                                                        value => '0'
+                                                     },
+                                        },
+                        'select'    => 'count(1) as cnt'
+                    });
+		    ($cnt) ? $cnt->cnt : '';
 		},
 		sub { # Have Usage
-            my $did_order = shift;
-		    my @dids = provisioned_dids($did_order->latanum);
-
+            my $phone_avail = shift;
+            return '' unless $phone_avail->latanum;
+            my $latanum = $phone_avail->latanum;
 		    my $count = 0;
-		    foreach my $did ( @dids ) {
-                my $svcnum = $did->svcnum;
-                next unless $svcnum;
-
-                my $sql = "select count(1) from cdr where src = 
-                    (select phonenum from svc_phone where svcnum = $svcnum)
-                    or charged_party = (select phonenum from svc_phone where
-                        svcnum = $svcnum)";
-                my $c = $did_order->scalar_sql($sql);
+            my $sql = "select count(1) from cdr where src in 
+                (select phonenum from svc_phone where svcnum in (
+                    select svcnum from phone_avail where latanum = $latanum
+                        and svcnum is not null) )
+                or charged_party in (select phonenum from svc_phone where
+                    svcnum in (select svcnum from phone_avail where
+                        latanum = $latanum and svcnum is not null) )";
+            my $c = $phone_avail->scalar_sql($sql);
                 $count++ if $c > 0;
-		    }
 		    $count;
 		},
               ],
@@ -75,8 +82,6 @@
 %>
 <%init>
 
-warn "started @ ".time;
-
 die "access denied"
   unless ( $FS::CurrentUser::CurrentUser->access_right('List inventory')
 	 && $FS::CurrentUser::CurrentUser->access_right('List services')
@@ -84,12 +89,4 @@
 
 # XXX: agent virtualize
 
-sub provisioned_dids {
-    my $latanum = shift;
-    qsearch({   'table' => 'phone_avail',
-	            'hashref' => { 'latanum' => $latanum, },
-	            'extra_sql' => ' and svcnum is not null ',
-	        });
-}
-
 </%init>