From: ivan <ivan>
Date: Sat, 11 Dec 2004 23:16:10 +0000 (+0000)
Subject: finish modification
X-Git-Tag: BEFORE_FINAL_MASONIZE~783
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=53584ad7f33910f2e33764d22745d48e76f12a8c

finish modification
---

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index dfc37d083..fb0299c52 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -107,6 +107,24 @@ sub _export_insert {
 }
 
 sub _export_replace {
+  my($self, $new, $old) = (shift, shift, shift);
+
+  my %map = $self->_map;
+  my $keymap = $map{$self->option('primary_key')};
+
+  my %record = map { my $value = $map{$_};
+                     $_ => $new->$value();
+                   } keys %map;
+
+  my $err_or_queue = $self->acct_sql_queue(
+    $new->svcnum,
+    'replace',
+    $self->option('table'),
+    $self->option('primary_key') => $old->$keymap(),
+    %record,
+  );
+  return $err_or_queue unless ref($err_or_queue);
+  '';
 }
 
 sub _export_delete {
@@ -146,7 +164,7 @@ sub acct_sql_insert { #subroutine, not method
     " ) VALUES ( ". join(", ", map '?', keys %record ). " )"
   ) or die $dbh->errstr;
 
-  $sth->execute( map $record{$_}, keys %record )
+  $sth->execute( values(%record) )
     or die "can't insert into $table table: ". $sth->errstr;
 
   $dbh->disconnect;
@@ -157,7 +175,7 @@ sub acct_sql_delete { #subroutine, not method
   my( $table, %record ) = @_;
 
   my $sth = $dbh->prepare(
-    "DELETE FROM  $table WHERE ". join(' AND ', map "$_ = ? ", keys %record )
+    "DELETE FROM $table WHERE ". join(' AND ', map "$_ = ? ", keys %record )
   ) or die $dbh->errstr;
 
   $sth->execute( map $record{$_}, keys %record )
@@ -166,6 +184,20 @@ sub acct_sql_delete { #subroutine, not method
   $dbh->disconnect;
 }
 
+sub acct_sql_replace { #subroutine, not method
+  my $dbh = acct_sql_connect(shift, shift, shift);
+  my( $table, $pkey, $old_pkey, %record ) = @_;
+
+  my $sth = $dbh->prepare(
+    "UPDATE $table SET ". join(', ', map "$_ = ?", keys %record ).
+    "WHERE $pkey = ?"
+  ) or die $dbh->errstr;
+
+  $sth->execute( values(%record), $old_pkey );
+
+  $dbh->disconnect;
+}
+
 sub acct_sql_connect {
   #my($datasrc, $username, $password) = @_;
   #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
@@ -174,4 +206,3 @@ sub acct_sql_connect {
 
 1;
 
-