[freeside-commits] branch master updated. 59c29eed0653360378f9c5428c1c3c5833c3b387

[Ivan]

The branch, master has been updated
       via  59c29eed0653360378f9c5428c1c3c5833c3b387 (commit)
       via  d4bd6b057accfd69731168873d57f5d0e652cf43 (commit)
      from  3c693abdf3cccf5a716a0ce7075f3f1ed1063786 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59c29eed0653360378f9c5428c1c3c5833c3b387
Merge: d4bd6b0 3c693ab
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 8 14:09:40 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit d4bd6b057accfd69731168873d57f5d0e652cf43
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 8 14:09:36 2013 -0700

    performance improvement for packages with many services, patch from jeff finucane, RT#23900

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index ddfab5d..398dce1 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2485,11 +2485,13 @@ sub _sort_cust_svc {
   my $sort =
     sub ($$) { my ($a, $b) = @_; $b->[1] cmp $a->[1]  or  $a->[2] <=> $b->[2] };
 
+  my %pkg_svc = map { $_->svcpart => $_ }
+                qsearch( 'pkg_svc', { 'pkgpart' => $self->pkgpart } );
+
   map  { $_->[0] }
   sort $sort
   map {
-        my $pkg_svc = qsearchs( 'pkg_svc', { 'pkgpart' => $self->pkgpart,
-                                             'svcpart' => $_->svcpart     } );
+        my $pkg_svc = $pkg_svc{ $_->svcpart } || '';
         [ $_,
           $pkg_svc ? $pkg_svc->primary_svc : '',
           $pkg_svc ? $pkg_svc->quantity : 0,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pkg.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)