[freeside-commits] freeside/FS/FS cust_svc.pm,1.59,1.60

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv5159

Modified Files:
	cust_svc.pm 
Log Message:
update cust_svc::seconds_since_sqlradacct to deal with any usage-capable export

Index: cust_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_svc.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- cust_svc.pm	28 Nov 2005 16:21:50 -0000	1.59
+++ cust_svc.pm	28 Nov 2005 16:34:34 -0000	1.60
@@ -492,10 +492,8 @@
 
   my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export('sqlradius');
-  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
-  die "no sqlradius or sqlradius_withdomain export configured for this".
-      "service type"
+  my @part_export = $self->part_svc->part_export_usage;
+  die "no usage-capable export configured for this service type"
     unless @part_export;
     #or return undef;
 
@@ -521,14 +519,7 @@
       $str2time = 'extract(epoch from ';
     }
 
-    my $username;
-    if ( $part_export->exporttype eq 'sqlradius' ) {
-      $username = $svc_x->username;
-    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
-      $username = $svc_x->email;
-    } else {
-      die 'unknown exporttype '. $part_export->exporttype;
-    }
+    my $username = $part_export->export_username($svc_x);
 
     my $sth = $dbh->prepare("SELECT SUM($attrib)
                                FROM radacct