X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Facct_sql.pm;h=9f1ae7b5c9e34840dde9ec2d1d4a0ed5acc121ef;hb=03eaa0e229c5f5fc68a178d20fb69733db709787;hp=e2282372fcaf61d7e64f1daf4bb93bc8225dc4ba;hpb=be6d221200eda1ad6de73a32fc20ddac8d5151ff;p=freeside.git
diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index e2282372f..9f1ae7b5c 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -17,6 +17,10 @@ tie my %options, 'Tie::IxHash',
'Database schema mapping to Freeside methods.',
type => 'textarea',
},
+ 'static' => { label =>
+ 'Database schema mapping to static values.',
+ type => 'textarea',
+ },
'primary_key' => { label => 'Database primary key' },
'crypt' => { label => 'Password encryption',
type=>'select', options=>[qw(crypt md5)],
@@ -65,6 +69,7 @@ tie my %postfix_native_mailbox_map, 'Tie::IxHash',
'uid' => 'uid',
'gid' => 'gid',
'password' => 'ldap_password',
+ 'mail' => 'domain_slash_username',
;
my $postfix_native_mailbox_map =
join('\n', map "$_ $postfix_native_mailbox_map{$_}",
@@ -106,15 +111,19 @@ to be configured for different mail server setups.
'>
END
);
+sub _schema_map { shift->_map('schema'); }
+sub _static_map { shift->_map('static'); }
+
sub _map {
my $self = shift;
- map { /^\s*(\S+)\s*(\S+)\s*$/ } split("\n", $self->option('schema') );
+ map { /^\s*(\S+)\s*(\S+)\s*$/ } split("\n", $self->option(shift) );
}
sub rebless { shift; }
@@ -122,14 +131,22 @@ sub rebless { shift; }
sub _export_insert {
my($self, $svc_acct) = (shift, shift);
- my %map = $self->_map;
+ my %schema = $self->_schema_map;
+ my %static = $self->_static_map;
+
+ my %record = (
- my %record = map { my $value = $map{$_};
- my @arg = ();
- push @arg, $self->option('crypt')
- if $value eq 'crypt_password' && $self->option('crypt');
- $_ => $svc_acct->$value(@arg);
- } keys %map;
+ ( map { $_ => $static{$_} } keys %static ),
+
+ ( map { my $value = $schema{$_};
+ my @arg = ();
+ push @arg, $self->option('crypt')
+ if $value eq 'crypt_password' && $self->option('crypt');
+ $_ => $svc_acct->$value(@arg);
+ } keys %schema
+ ),
+
+ );
my $err_or_queue =
$self->acct_sql_queue(
@@ -147,25 +164,33 @@ sub _export_insert {
sub _export_replace {
my($self, $new, $old) = (shift, shift, shift);
- my %map = $self->_map;
+ my %schema = $self->_schema_map;
+ my %static = $self->_static_map;
my @primary_key = ();
if ( $self->option('primary_key') =~ /,/ ) {
foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
- my $keymap = $map{$key};
+ my $keymap = $schema{$key};
push @primary_key, $old->$keymap();
}
} else {
- my $keymap = $map{$self->option('primary_key')};
+ my $keymap = $schema{$self->option('primary_key')};
push @primary_key, $old->$keymap();
}
- my %record = map { my $value = $map{$_};
- my @arg = ();
- push @arg, $self->option('crypt')
- if $value eq 'crypt_password' && $self->option('crypt');
- $_ => $new->$value(@arg);
- } keys %map;
+ my %record = (
+
+ ( map { $_ => $static{$_} } keys %static ),
+
+ ( map { my $value = $schema{$_};
+ my @arg = ();
+ push @arg, $self->option('crypt')
+ if $value eq 'crypt_password' && $self->option('crypt');
+ $_ => $new->$value(@arg);
+ } keys %schema
+ ),
+
+ );
my $err_or_queue = $self->acct_sql_queue(
$new->svcnum,
@@ -181,16 +206,16 @@ sub _export_replace {
sub _export_delete {
my ( $self, $svc_acct ) = (shift, shift);
- my %map = $self->_map;
+ my %schema = $self->_schema_map;
my %primary_key = ();
if ( $self->option('primary_key') =~ /,/ ) {
foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
- my $keymap = $map{$key};
+ my $keymap = $schema{$key};
$primary_key{ $key } = $svc_acct->$keymap();
}
} else {
- my $keymap = $map{$self->option('primary_key')};
+ my $keymap = $schema{$self->option('primary_key')};
$primary_key{ $self->option('primary_key') } = $svc_acct->$keymap(),
}