X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fsvc_pbx.pm;h=d35b3a22c38eff3de2511f3ae949d714c6bdfb1d;hb=f3ac48703be75c0e2aec161487057eafeb8fc74f;hp=adc45a78fb00d5f087ee3f47d8c8f89a7ea36277;hpb=d65218690bc95244ea98df2923f552325f8253a5;p=freeside.git

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index adc45a78f..d35b3a22c 100644
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -1,8 +1,10 @@
 package FS::svc_pbx;
+use base qw( FS::o2m_Common FS::device_Common FS::svc_External_Common );
 
 use strict;
-use base qw( FS::svc_External_Common );
+use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs dbh );
+use FS::PagedSearch qw( psearch );
 use FS::Conf;
 use FS::cust_svc;
 use FS::svc_phone;
@@ -79,37 +81,24 @@ points to.  You can ask the object for a copy with the I<hash> method.
 sub table { 'svc_pbx'; }
 
 sub table_info {
+
+  tie my %fields, 'Tie::IxHash',
+    'svcnum' => 'PBX',
+    'id'     => 'PBX/Tenant ID',
+    'title'  => 'Name',
+    'max_extensions' => 'Maximum number of User Extensions',
+    'max_simultaneous' => 'Maximum number of simultaneous users',
+  ;
+
   {
     'name' => 'PBX',
-    'name_plural' => 'PBXs', #optional,
-    'longname_plural' => 'PBXs', #optional
+    'name_plural' => 'PBXs',
+    'lcname_plural' => 'PBXs',
+    'longname_plural' => 'PBXs',
     'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first)
     'display_weight' => 70,
     'cancel_weight'  => 90,
-    'fields' => {
-      'id'    => 'ID',
-      'title' => 'Name',
-      'max_extensions' => 'Maximum number of User Extensions',
-      'max_simultaneous' => 'Maximum number of simultaneous users',
-#      'field'         => 'Description',
-#      'another_field' => { 
-#                           'label'     => 'Description',
-#			   'def_label' => 'Description for service definitions',
-#			   'type'      => 'text',
-#			   'disable_default'   => 1, #disable switches
-#			   'disable_fixed'     => 1, #
-#			   'disable_inventory' => 1, #
-#			 },
-#      'foreign_key'   => { 
-#                           'label'        => 'Description',
-#			   'def_label'    => 'Description for service defs',
-#			   'type'         => 'select',
-#			   'select_table' => 'foreign_table',
-#			   'select_key'   => 'key_field_in_table',
-#			   'select_label' => 'label_field_in_table',
-#			 },
-
-    },
+    'fields' => \%fields,
   };
 }
 
@@ -253,29 +242,36 @@ sub check {
   $self->SUPER::check;
 }
 
-#XXX this is a way-too simplistic implementation
-# at the very least, title should be unique across exports that need that or
-# controlled by a conf setting or something
 sub _check_duplicate {
   my $self = shift;
 
   my $conf = new FS::Conf;
-  return '' if $conf->config('global_unique-pbx_title') eq 'disabled';
-
+  
   $self->lock_table;
 
-  if ( qsearchs( 'svc_pbx', { 'title' => $self->title } ) ) {
-    return "Name in use";
-  } else {
-    return '';
+  foreach my $field ('title', 'id') {
+    my $global_unique = $conf->config("global_unique-pbx_$field");
+    # can be 'disabled', 'enabled', or empty.
+    # if empty, check per exports; if not empty or disabled, check 
+    # globally.
+    next if $global_unique eq 'disabled';
+    my @dup = $self->find_duplicates(
+      ($global_unique ? 'global' : 'export') , $field
+    );
+    next if !@dup;
+    return "duplicate $field '".$self->getfield($field).
+           "': conflicts with svcnum ".$dup[0]->svcnum;
   }
+  return '';
 }
 
-=item get_cdrs
+=item psearch_cdrs OPTIONS
 
-Returns a set of Call Detail Records (see L<FS::cdr>) associated with this 
-service.  By default, "associated with" means that the "charged_party" field of
-the CDR matches the "title" field of the service.
+Returns a paged search (L<FS::PagedSearch>) for Call Detail Records 
+associated with this service.  By default, "associated with" means that 
+the "charged_party" field of the CDR matches the "title" field of the 
+service.  To access the CDRs themselves, call "->fetch" on the resulting
+object.
 
 =over 2
 
@@ -295,11 +291,21 @@ with the chosen prefix.
 =item by_svcnum => 1: Select CDRs where the svcnum field matches, instead of 
 title/charged_party.  Normally this field is set after processing.
 
+=item by_ip_addr => 'src' or 'dst': Select CDRs where the src_ip_addr or 
+dst_ip_addr field matches title.  In this case, some special logic is applied
+to allow title to indicate a range of IP addresses.
+
+=item begin, end: Start and end of date range, as unix timestamp.
+
+=item cdrtypenum: Only return CDRs with this type.
+
+=item calltypenum: Only return CDRs with this call type.
+
 =back
 
 =cut
 
-sub get_cdrs {
+sub psearch_cdrs {
   my($self, %options) = @_;
   my %hash = ();
   my @where = ();
@@ -307,12 +313,23 @@ sub get_cdrs {
   my @fields = ( 'charged_party' );
   $hash{'freesidestatus'} = $options{'status'}
     if exists($options{'status'});
-  
+
+  if ($options{'cdrtypenum'}) {
+    $hash{'cdrtypenum'} = $options{'cdrtypenum'};
+  }
+  if ($options{'calltypenum'}) {
+    $hash{'calltypenum'} = $options{'calltypenum'};
+  }
+
   my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
 
   if ( $options{'by_svcnum'} ) {
     $hash{'svcnum'} = $self->svcnum;
   }
+  elsif ( $options{'by_ip_addr'} =~ /^src|dst$/) {
+    my $field = 'cdr.'.$options{'by_ip_addr'}.'_ip_addr';
+    push @where, FS::cdr->ip_addr_sql($field, $self->title);
+  }
   else {
     #matching by title
     my $title = $self->title;
@@ -339,15 +356,26 @@ sub get_cdrs {
   my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where )
     if @where;
 
-  my @cdrs =
-    qsearch( {
+  psearch( {
       'table'      => 'cdr',
       'hashref'    => \%hash,
       'extra_sql'  => $extra_sql,
       'order_by'   => "ORDER BY startdate $for_update",
-    } );
+  } );
+}
+
+=item get_cdrs (DEPRECATED)
 
-  @cdrs;
+Like psearch_cdrs, but returns all the L<FS::cdr> objects at once, in a 
+single list.  Arguments are the same as for psearch_cdrs.  This can take
+an unreasonably large amount of memory and is best avoided.
+
+=cut
+
+sub get_cdrs {
+  my $self = shift;
+  my $psearch = $self->psearch_cdrs($_);
+  qsearch ( $psearch->{query} )
 }
 
 =back