X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fbill.pm;h=7de2ff2f6c6f6a72252c20a4dcdd2851e62c82e0;hb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;hp=38fbae5240ba6337a0b6141fc427e77ecd102b91;hpb=e3dd31c479fb51c2a543ef3c0d7aff59bc44d6f4;p=freeside.git

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 38fbae524..7de2ff2f6 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -4,7 +4,8 @@ use strict;
 use vars qw( @ISA @EXPORT_OK );
 use Exporter;
 use Date::Parse;
-use FS::Record qw(qsearch qsearchs);
+use FS::UID qw(dbh);
+use FS::Record qw(qsearchs);
 use FS::cust_main;
 use FS::part_event;
 use FS::part_event_condition;
@@ -18,14 +19,30 @@ sub bill {
 
   my $check_freq = $opt{'check_freq'} || '1d';
 
-  $FS::cust_main::DEBUG = 1 if $opt{'v'};
-  $FS::cust_main::DEBUG = $opt{'l'} if $opt{'l'};
+  my $debug = 0;
+  $debug = 1 if $opt{'v'};
+  $debug = $opt{'l'} if $opt{'l'};
+ 
+  $FS::cust_main::DEBUG = $debug;
   #$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
-  
-  my %search = ();
-  $search{'payby'}    = $opt{'p'} if $opt{'p'};
-  $search{'agentnum'} = $opt{'a'} if $opt{'a'};
-  
+
+  my @search = ();
+
+  push @search, "cust_main.payby    = '". $opt{'p'}. "'"
+    if $opt{'p'};
+  push @search, "cust_main.agentnum =  ". $opt{'a'}
+    if $opt{'a'};
+
+  if ( @ARGV ) {
+    push @search, "( ".
+      join(' OR ', map "cust_main.custnum = $_", @ARGV ).
+    " )";
+  }
+
+  ###
+  # generate where_pkg/where_event search clause
+  ###
+
   #we're at now now (and later).
   my($time)= $opt{'d'} ? str2time($opt{'d'}) : $^T;
   $time += $opt{'y'} * 86400 if $opt{'y'};
@@ -44,7 +61,7 @@ sub bill {
                   )
         )
 END
-  
+
   my $where_event = join(' OR ', map {
     my $eventtable = $_;
 
@@ -74,29 +91,30 @@ END
 
   } FS::part_event->eventtables);
 
-  my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ).
-                  "( $where_pkg OR $where_event )";
-  
-  my @cust_main;
-  if ( @ARGV ) {
-    @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
-  } else {
+  push @search, "( $where_pkg OR $where_event )";
 
-    warn "searching for customers:\n".
-         join("\n", map "  $_ => ".$search{$_}, keys %search). "\n".
-         "  $extra_sql\n"
-      if $opt{'v'} || $opt{'l'};
+  ###
+  # get a list of custnums
+  ###
 
-    @cust_main = qsearch({
-      'table'     => 'cust_main',
-      'hashref'   => \%search,
-      'extra_sql' => $extra_sql,
-    });
+  warn "searching for customers:\n". join("\n", @search). "\n"
+    if $opt{'v'} || $opt{'l'};
 
-  }
+  my $sth = dbh->prepare(
+    "SELECT custnum FROM cust_main".
+    " WHERE ". join(' AND ', @search)
+  ) or die dbh->errstr;
+
+  $sth->execute or die $sth->errstr;
+
+  my @custnums = map { $_->[0] } @{ $sth->fetchall_arrayref };
+
+  ###
+  # for each custnum, queue or make one customer object and bill
+  # (one at a time, to reduce memory footprint with large #s of customers)
+  ###
   
-  my($cust_main,%saw);
-  foreach $cust_main ( @cust_main ) {
+  foreach my $custnum ( @custnums ) {
 
     if ( $opt{'m'} ) {
 
@@ -106,7 +124,7 @@ END
           'secure' => 'Y',
         };
         my $error = $queue->insert(
-        'custnum'      =>  $cust_main->custnum,
+        'custnum'      => $custnum,
         'time'         => $time,
         'invoice_time' => $invoice_time,
         'check_freq'   => $check_freq,
@@ -115,15 +133,18 @@ END
 
     } else {
 
+      my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
+
       $cust_main->bill_and_collect(
         'time'         => $time,
         'invoice_time' => $invoice_time,
         'check_freq'   => $check_freq,
         'resetup'      => $opt{'s'},
+        'debug'        => $debug,
       );
 
     }
-  
+
   }
 
 }