Beispielscript für CSV-Import über die Kommandozeile

[kivitendo-erp.git] / SL / DBUpgrade2.pm

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index f308599..a583af8 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -4,6 +4,7 @@ use IO::File;
 use List::MoreUtils qw(any);
 
 use SL::Common;
+use SL::DBUtils;
 use SL::Iconv;
 
 use strict;
@@ -244,7 +245,7 @@ sub process_perl_script {
 
   $db_charset ||= Common::DEFAULT_CHARSET;
 
-  my $iconv = SL::Iconv::get_converter($file_charset, $db_charset);
+  my $iconv = SL::Iconv->new($file_charset, $db_charset);
 
   $dbh->begin_work();
 
@@ -329,8 +330,6 @@ sub update2_available {
 sub unapplied_upgrade_scripts {
   my ($self, $dbh) = @_;
 
-  $::lxdebug->dump(0, "self", $self);
-
   my @all_scripts = map { $_->{applied} = 0; $_ } $self->sort_dbupdate_controls;
 
   my $query = qq|SELECT tag FROM | . $self->{schema} . qq|schema_info|;
@@ -354,7 +353,7 @@ sub apply_admin_dbupgrade_scripts {
 
   return 0 if !@unapplied_scripts;
 
-  my $db_charset           = $main::dbcharset || Common::DEFAULT_CHARSET;
+  my $db_charset           = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
   $self->{form}->{login} ||= 'admin';
 
   map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $self->{all_controls} };