[freeside-commits] freeside/FS/FS Schema.pm, 1.155, 1.156 cdr.pm, 1.49, 1.50 cdr_upstream_rate.pm, 1.1, NONE

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv9064/FS/FS

Modified Files:
	Schema.pm cdr.pm 
Removed Files:
	cdr_upstream_rate.pm 
Log Message:
get rid of cdr_upstream_rate table and some other old convergent cruft

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Schema.pm	7 Jul 2009 09:53:15 -0000	1.155
+++ Schema.pm	17 Jul 2009 00:10:33 -0000	1.156
@@ -2206,18 +2206,6 @@
       'index'       => [],
     },
 
-    #map upstream rateid to ours...
-    'cdr_upstream_rate' => {
-      'columns' => [
-        'upstreamratenum', 'serial',  '', '', '', '',
-        'upstream_rateid', 'varchar', '', $char_d, '', '', 
-        'ratedetailnum',   'int', 'NULL', '', '', '',
-      ],
-      'primary_key' => 'upstreamratenum', #XXX need a primary key
-      'unique' => [ [ 'upstream_rateid' ] ], #unless we add another field, yeah
-      'index'  => [],
-    },
-
     #'cdr_file' => {
     #  'columns' => [
     #    'filenum',    'serial',     '', '', '', '',

Index: cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- cdr.pm	15 Jul 2009 22:49:33 -0000	1.49
+++ cdr.pm	17 Jul 2009 00:10:33 -0000	1.50
@@ -472,51 +472,11 @@
   $cdr_calltype ? $cdr_calltype->calltypename : '';
 }
 
-=item cdr_upstream_rate
-
-Returns the upstream rate mapping (see L<FS::cdr_upstream_rate>), or the empty
-string if no FS::cdr_upstream_rate object is associated with this CDR.
-
-=cut
-
-sub cdr_upstream_rate {
-  my $self = shift;
-  return '' unless $self->upstream_rateid;
-  qsearchs('cdr_upstream_rate', { 'upstream_rateid' => $self->upstream_rateid })
-    or '';
-}
-
-=item _convergent_format COLUMN [ COUNTRYCODE ]
-
-Returns the number in COLUMN formatted as follows:
-
-If the country code does not match COUNTRYCODE (default "61"), it is returned
-unchanged.
-
-If the country code does match COUNTRYCODE (default "61"), it is removed.  In
-addiiton, "0" is prepended unless the number starts with 13, 18 or 19. (???)
-
-=cut
-
-sub _convergent_format {
-  my( $self, $field ) = ( shift, shift );
-  my $countrycode = scalar(@_) ? shift : '61'; #+61 = australia
-  #my $number = $self->$field();
-  my $number = $self->get($field);
-  #if ( $number =~ s/^(\+|011)$countrycode// ) {
-  if ( $number =~ s/^\+$countrycode// ) {
-    $number = "0$number"
-      unless $number =~ /^1[389]/; #???
-  }
-  $number;
-}
-
 =item downstream_csv [ OPTION => VALUE, ... ]
 
 =cut
 
 my %export_names = (
-  'convergent'      => {},
   'simple'  => {
     'name'           => 'Simple',
     'invoice_header' => "Date,Time,Name,Destination,Duration,Price",
@@ -550,21 +510,6 @@
 };
 
 my %export_formats = (
-  'convergent' => [
-    'carriername', #CARRIER
-    sub { shift->_convergent_format('src') }, #SERVICE_NUMBER
-    sub { shift->_convergent_format('charged_party') }, #CHARGED_NUMBER
-    sub { time2str('%Y-%m-%d', shift->calldate_unix ) }, #DATE
-    sub { time2str('%T',       shift->calldate_unix ) }, #TIME
-    'billsec', #'duration', #DURATION
-    sub { shift->_convergent_format('dst') }, #NUMBER_DIALED
-    '', #XXX add (from prefixes in most recent email) #FROM_DESC
-    '', #XXX add (from prefixes in most recent email) #TO_DESC
-    'calltypename', #CLASS_CODE
-    'rated_price', #PRICE
-    sub { shift->rated_price ? 'Y' : 'N' }, #RATED
-    '', #OTHER_INFO
-  ],
   'simple' => [
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
     sub { time2str('%r', shift->calldate_unix ) },   #TIME
@@ -618,7 +563,7 @@
 sub downstream_csv {
   my( $self, %opt ) = @_;
 
-  my $format = $opt{'format'}; # 'convergent';
+  my $format = $opt{'format'};
   return "Unknown format $format" unless exists $export_formats{$format};
 
   #my $conf = new FS::Conf;

--- cdr_upstream_rate.pm DELETED ---