From: ivan <ivan>
Date: Fri, 7 Nov 2003 08:36:32 +0000 (+0000)
Subject: finish fixing sqlradius_withdomain time calculations
X-Git-Tag: freeside_1_4_2beta1~397
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=460ac2faf0940812ab42f6255a7cbd0cc4cac838;p=freeside.git

finish fixing sqlradius_withdomain time calculations
---

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 4c5a64059..e27698af1 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -356,10 +356,13 @@ for records where B<svcdb> is not "svc_acct".
 sub seconds_since_sqlradacct {
   my($self, $start, $end) = @_;
 
-  my $username = $self->svc_x->username;
+  my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export('sqlradius')
-    or die "no sqlradius export configured for this service type";
+  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"
+    unless @part_export;
     #or return undef;
 
   my $seconds = 0;
@@ -381,6 +384,15 @@ sub seconds_since_sqlradacct {
       $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 $query;
   
     #find closed sessions completely within the given range