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

[freeside.git] / FS / FS / svc_Tower_Mixin.pm

diff --git a/FS/FS/svc_Tower_Mixin.pm b/FS/FS/svc_Tower_Mixin.pm
index 6adbc6f..2555b9e 100644 (file)
--- a/FS/FS/svc_Tower_Mixin.pm
+++ b/FS/FS/svc_Tower_Mixin.pm
@@ -1,19 +1,9 @@
 package FS::svc_Tower_Mixin;
 
 use strict;
-use FS::Record qw(qsearchs); #qsearch;
-use FS::tower_sector;
 
 =item tower_sector
 
-=cut
-
-sub tower_sector {
-  my $self = shift;
-  return '' unless $self->sectornum;
-  qsearchs('tower_sector', { sectornum => $self->sectornum });
-}
-
 =item tower_sector_sql HASHREF
 
 Class method which returns a list of WHERE clause fragments to 
@@ -27,12 +17,10 @@ towernum or sectornum can also contain 'none' to allow null values.
 =cut
 
 sub tower_sector_sql {
-  my $class = shift;
-  my $params = shift;
-  return '' unless keys %$params;
-  my $where = '';
+  my( $class, $params ) = @_;
+  return () unless keys %$params;
 
-  my @where;
+  my @where = ();
   for my $field (qw(towernum sectornum)) {
     my $value = $params->{$field} or next;
     if ( ref $value and grep { $_ } @$value ) {