diff options
author | ivan <ivan> | 2007-11-09 17:42:11 +0000 |
---|---|---|
committer | ivan <ivan> | 2007-11-09 17:42:11 +0000 |
commit | 55bbd04b9381b45618f89ca2ed73361765343e49 (patch) | |
tree | c7b3d3d05903e7c83d0ced9e156a75d98f0185d3 | |
parent | 28ab57f0f8b6f2d656ee101cb0a67e89e72bfed1 (diff) |
mysql fix for regexen, 1.7-style
-rw-r--r-- | FS/FS/cust_main.pm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 59bbe0bb7..c95ebf79a 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -22,7 +22,7 @@ use String::Approx qw(amatch); use Business::CreditCard 0.28; use Locale::Country; use Data::Dumper; -use FS::UID qw( getotaker dbh ); +use FS::UID qw( getotaker dbh driver_name ); use FS::Record qw( qsearchs qsearch dbdef ); use FS::Misc qw( send_email generate_ps do_print ); use FS::Msgcat qw(gettext); @@ -5268,11 +5268,20 @@ sub agent_invoice_from { sub _agent_plandata { my( $self, $option ) = @_; + my $regexp = ''; + if ( driver_name =~ /^Pg/i ) { + $regexp = '~'; + } elsif ( driver_name =~ /^mysql/i ) { + $regexp = 'REGEXP'; + } else { + die "don't know how to use regular expressions in ". driver_name. " databases"; + } + my $part_bill_event = qsearchs( 'part_bill_event', { 'payby' => $self->payby, 'plan' => 'send_agent', - 'plandata' => { 'op' => '~', + 'plandata' => { 'op' => $regexp, 'value' => "(^|\n)agentnum ". '([0-9]*, )*'. $self->agentnum. |