($new_record, $options) = $template_recored->clone( $svcpart );
$error = $record->insert( { 'option' => 'value' } );
- $error = $record->insert( \$options );
+ $error = $record->insert( \%options );
$error = $new_record->replace($old_record);
#false laziness w/queue.pm
sub insert {
my $self = shift;
+ my $options = shift;
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
local $SIG{QUIT} = 'IGNORE';
return $error;
}
- my $options = shift;
foreach my $optionname ( keys %{$options} ) {
my $part_export_option = new FS::part_export_option ( {
'exportnum' => $self->exportnum,
sub replace {
my $self = shift;
+ my $old = shift;
+ my $options = shift;
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
local $SIG{QUIT} = 'IGNORE';
local $FS::UID::AutoCommit = 0;
my $dbh = dbh;
- my $error = $self->SUPER::replace;
+ my $error = $self->SUPER::replace($old);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
- my $options = shift;
foreach my $optionname ( keys %{$options} ) {
my $old = qsearchs( 'part_export_option', {
'exportnum' => $self->exportnum,
'optionname' => $optionname,
'optionvalue' => $options->{$optionname},
} );
+ $new->optionnum($old->optionnum) if $old;
my $error = $old ? $new->replace($old) : $new->insert;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
}
}
+ #remove extraneous old options
+ foreach my $opt (
+ grep { !exists $options->{$_->optionname} } $old->part_export_option
+ ) {
+ my $error = $opt->delete;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+ }
+
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
my $self = shift;
my $error =
$self->ut_numbern('exportnum')
+ || $self->ut_domain('machine')
|| $self->ut_number('svcpart')
|| $self->ut_alpha('exporttype')
;
=item part_export_option
+Returns all options as FS::part_export_option objects (see
+L<FS::part_export_option>).
+
=cut
sub part_export_option {
=item options
+Returns a list of option names and values suitable for assigning to a hash.
+
=cut
sub options {
map { $_->optionname => $_->optionvalue } $self->part_export_option;
}
-=item option
+=item option OPTIONNAME
+
+Returns the option value for the given name, or the empty string.
=cut
=item rebless
+Reblesses the object into the FS::part_export::EXPORTTYPE class, where
+EXPORTTYPE is the object's I<exporttype> field. There should be better docs
+on how to create new exports (and they should live in their own files and be
+autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
+
=cut
sub rebless {
=item export_insert SVC_OBJECT
-Calls the appropriate export_I<exporttype> for this object's exporttype.
-
=cut
sub export_insert {
# $self->$method(@_);
#}
-=item export_replace
+=item export_replace NEW OLD
=cut
=back
+=cut
+
#infostreet
package FS::part_export::infostreet;
die $key_result{error} unless $key_result{success};
my $key = $key_result{data};
- my $result = $conn->call($opt{method}, $key, @{$opt{args}});
+ my $result = $conn->call($method, $key, @args);
my %result = _infostreet_parse($result);
die $result{error} unless $result{success};
my %new = $new->$method;
my %old = $old->$method;
if ( grep { !exists $old{$_} #new attributes
- || $new{$n} ne $old{$n} #changed
+ || $new{$_} ne $old{$_} #changed
} keys %new
) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'insert'
+ my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
$table, $new->username, %new );
return $error if $error;
}
}
sub _export_delete {
- my( $self, $svc_something ) = (shift, shift);
+ my( $self, $svc_acct ) = (shift, shift);
$self->sqlradius_queue( $svc_acct->svcnum, 'delete',
- $svc_something->username );
+ $svc_acct->username );
}
sub sqlradius_queue {
foreach my $attribute ( @attrib ) {
my $sth = $dbh->prepare(
- "DELETE FROM $table WHERE UserName = ? AND Attribute = ?" )
+ "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
or die $dbh->errstr;
$sth->execute($username,$attribute)
- or die "can't delete from $table table: ". $sth->errstr;
+ or die "can't delete from rad$replycheck table: ". $sth->errstr;
}
$dbh->disconnect;
}
DBI->connect(@_) or die $DBI::errstr;
}
-=head1 NOTES
-
-Writing a new export class:
+=head1 NEW EXPORT CLASSES
-#myexport
-
-package FS::part_export::myexport;
-use vars qw(@ISA);
-@ISA = qw(FS::part_export);
-
-sub _export_insert {
- my($self, $svc_something) = (shift, shift);
- $self->myexport_queue( $svc_acct->svcnum, 'insert',
- $svc_something->username, $svc_something->password );
-}
-
-sub _export_replace {
- my( $self, $new, $old ) = (shift, shift, shift);
- #return "can't change username with myexport"
- # if $old->username ne $new->username;
- #return '' unless $old->_password ne $new->_password;
- $self->myexport_queue( $new->svcnum,
- 'replace', $new->username, $new->password );
-}
-
-sub _export_delete {
- my( $self, $svc_something ) = (shift, shift);
- $self->myexport_queue( $svc_acct->svcnum,
- 'delete', $svc_something->username );
-}
-
-#a good idea to queue anything that could fail or take any time
-sub myexport_queue {
- my( $self, $svcnum, $method ) = (shift, shift, shift);
- my $queue = new FS::queue {
- 'svcnum' => $svcnum,
- 'job' => "FS::part_export::myexport::myexport_$method",
- };
- $queue->insert( @_ );
-}
-
-sub myexport_insert { #subroutine, not method
-}
-sub myexport_replace { #subroutine, not method
-}
-sub myexport_delete { #subroutine, not method
-}
+ #myexport
+
+ package FS::part_export::myexport;
+ use vars qw(@ISA);
+ @ISA = qw(FS::part_export);
+
+ sub _export_insert {
+ my($self, $svc_something) = (shift, shift);
+ $self->myexport_queue( $svc_acct->svcnum, 'insert',
+ $svc_something->username, $svc_something->password );
+ }
+
+ sub _export_replace {
+ my( $self, $new, $old ) = (shift, shift, shift);
+ #return "can't change username with myexport"
+ # if $old->username ne $new->username;
+ #return '' unless $old->_password ne $new->_password;
+ $self->myexport_queue( $new->svcnum,
+ 'replace', $new->username, $new->password );
+ }
+
+ sub _export_delete {
+ my( $self, $svc_something ) = (shift, shift);
+ $self->myexport_queue( $svc_acct->svcnum,
+ 'delete', $svc_something->username );
+ }
+
+ #a good idea to queue anything that could fail or take any time
+ sub myexport_queue {
+ my( $self, $svcnum, $method ) = (shift, shift, shift);
+ my $queue = new FS::queue {
+ 'svcnum' => $svcnum,
+ 'job' => "FS::part_export::myexport::myexport_$method",
+ };
+ $queue->insert( @_ );
+ }
+
+ sub myexport_insert { #subroutine, not method
+ }
+ sub myexport_replace { #subroutine, not method
+ }
+ sub myexport_delete { #subroutine, not method
+ }
=head1 BUGS
projects / freeside.git / blobdiff