This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

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

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index 0eb5443..d2760a5 100644 (file)
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -253,27 +253,22 @@ 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;
 
-  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;
+  if ( qsearchs( 'svc_pbx', { 'title' => $self->title } ) ) {
+    return "Name in use";
+  } else {
+    return '';
   }
-  return '';
 }
 
 =item get_cdrs
@@ -297,9 +292,6 @@ with the chosen prefix.
 
 =item disable_src => 1: No-op for svc_pbx CDR processing.
 
-=item by_svcnum => 1: Select CDRs where the svcnum field matches, instead of 
-title/charged_party.  Normally this field is set after processing.
-
 =back
 
 =cut
@@ -315,25 +307,19 @@ sub get_cdrs {
   
   my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
 
-  if ( $options{'by_svcnum'} ) {
-    $hash{'svcnum'} = $self->svcnum;
-  }
-  else {
-    #matching by title
-    my $title = $self->title;
+  my $title = $self->title;
 
-    my $prefix = $options{'default_prefix'};
+  my $prefix = $options{'default_prefix'};
 
-    my @orwhere =  map " $_ = '$title'        ", @fields;
-    push @orwhere, map " $_ = '$prefix$title' ", @fields
-      if length($prefix);
-    if ( $prefix =~ /^\+(\d+)$/ ) {
-      push @orwhere, map " $_ = '$1$title' ", @fields
-    }
-
-    push @where, ' ( '. join(' OR ', @orwhere ). ' ) ';
+  my @orwhere =  map " $_ = '$title'        ", @fields;
+  push @orwhere, map " $_ = '$prefix$title' ", @fields
+    if length($prefix);
+  if ( $prefix =~ /^\+(\d+)$/ ) {
+    push @orwhere, map " $_ = '$1$title' ", @fields
   }
 
+  push @where, ' ( '. join(' OR ', @orwhere ). ' ) ';
+
   if ( $options{'begin'} ) {
     push @where, 'startdate >= '. $options{'begin'};
   }
@@ -341,8 +327,7 @@ sub get_cdrs {
     push @where, 'startdate < '.  $options{'end'};
   }
 
-  my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where )
-    if @where;
+  my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where );
 
   my @cdrs =
     qsearch( {