CSV-Import: single-dbh

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 2fa788753dd8ed52f12c87a9ddd67256384f17e1..17a3bfdd6563341ee76a4137bf90cb59a94ebe02 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -461,7 +461,7 @@ sub save_objects {
 
   $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
 
 
   $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
 

-  my $dbh = $data->[0]{object}->db;
+  my $dbh = $data->[0]{object}->db->dbh;

 
   my $last_index = $#$data;
   my $chunk_size = 100;      # one transaction and progress update every 100 objects
 
   my $last_index = $#$data;
   my $chunk_size = 100;      # one transaction and progress update every 100 objects

diff --git a/SL/Controller/CsvImport/Inventory.pm b/SL/Controller/CsvImport/Inventory.pm
index a6e90018903425379d0a076aa0811242ed45c95d..238abf33add0cca6565f087e86d7ab48f1f3d957 100644 (file)
--- a/SL/Controller/CsvImport/Inventory.pm
+++ b/SL/Controller/CsvImport/Inventory.pm
@@ -395,7 +395,7 @@ sub save_objects {
   my $data = $params{data} || $self->controller->data;
 
   foreach my $entry (@{ $data }) {
   my $data = $params{data} || $self->controller->data;
 
   foreach my $entry (@{ $data }) {

-    my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
+    my ($trans_id) = selectrow_query($::form,$entry->{object}->db->dbh, qq|SELECT nextval('id')|);

     $entry->{object}->trans_id($trans_id);
   }
 
     $entry->{object}->trans_id($trans_id);
   }
 


@@ -424,7 +424,7 @@ SQL
                 $object->chargenumber);
   push @values, $object->bestbefore if $bestbefore_val_cnt;
 
                 $object->chargenumber);
   push @values, $object->bestbefore if $bestbefore_val_cnt;
 

-  my ($stocked_qty) = selectrow_query($::form, $::form->get_standard_dbh, $query, @values);
+  my ($stocked_qty) = selectrow_query($::form, $object->db->dbh, $query, @values);

 
   return $stocked_qty;
 }
 
   return $stocked_qty;
 }