Kleines Hilfsmodul für Zeichensatzkonvertierung hinzugefügt. In am.pl und rp.pl werde...

diff --git a/SL/Iconv.pm b/SL/Iconv.pm
new file mode 100644 (file)
index 0000000..29bf99d
--- /dev/null
+++ b/SL/Iconv.pm
@@ -0,0 +1,31 @@
+package SL::Iconv;
+
+use Text::Iconv;
+
+use SL::Common;
+
+use vars qw(%converters);
+
+sub get_converter {
+  my ($from_charset, $to_charset) = @_;
+
+  my $index = "${from_charset}::${to_charset}";
+  if (!$converters{$index}) {
+    $converters{$index} = Text::Iconv->new($from_charset, $to_charset) || die;
+  }
+
+  return $converters{$index};
+}
+
+sub convert {
+  my ($from_charset, $to_charset, $text) = @_;
+
+  $from_charset ||= Common::DEFAULT_CHARSET;
+  $to_charset   ||= Common::DEFAULT_CHARSET;
+
+  my $converter = get_converter($from_charset, $to_charset);
+  return $converter->convert($text);
+}
+
+1;
+

diff --git a/SL/User.pm b/SL/User.pm
index d7d138588dfe6351b213a4c02f64713c0810d512..93c88834e0f6e97bb200126c4e96dfe5504b3fba 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -36,10 +36,10 @@ package User;
 
 use IO::File;
 use Fcntl qw(:seek);
 
 use IO::File;
 use Fcntl qw(:seek);

-use Text::Iconv;

 
 use SL::DBUpgrade2;
 use SL::DBUtils;
 
 use SL::DBUpgrade2;
 use SL::DBUtils;

+use SL::Iconv;

 
 sub new {
   $main::lxdebug->enter_sub();
 
 sub new {
   $main::lxdebug->enter_sub();


@@ -460,7 +460,7 @@ sub process_perl_script {
 
   $db_charset ||= Common::DEFAULT_CHARSET;
 
 
   $db_charset ||= Common::DEFAULT_CHARSET;
 

-  my $iconv = Text::Iconv->new($file_charset, $db_charset);
+  my $iconv = SL::Iconv::get_converter($file_charset, $db_charset);

 
   $dbh->begin_work();
 
 
   $dbh->begin_work();
 


@@ -524,12 +524,10 @@ sub process_query {
 
   $db_charset ||= Common::DEFAULT_CHARSET;
 
 
   $db_charset ||= Common::DEFAULT_CHARSET;
 

-  my $iconv = Text::Iconv->new($file_charset, $db_charset);
-

   $dbh->begin_work();
 
   while (<$fh>) {
   $dbh->begin_work();
 
   while (<$fh>) {

-    $_ = $iconv->convert($_);
+    $_ = SL::Iconv::convert($file_charset, $db_charset, $_);

 
     # Remove DOS and Unix style line endings.
     chomp;
 
     # Remove DOS and Unix style line endings.
     chomp;


@@ -912,8 +910,6 @@ sub dbupdate2 {
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;
 
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;
 

-  my %converters;
-

   foreach my $db (split / /, $form->{dbupdate}) {
 
     next unless $form->{$db};
   foreach my $db (split / /, $form->{dbupdate}) {
 
     next unless $form->{$db};


@@ -949,10 +945,7 @@ sub dbupdate2 {
     foreach my $control (@upgradescripts) {
       next if ($control->{"applied"});
 
     foreach my $control (@upgradescripts) {
       next if ($control->{"applied"});
 

-      if (!$converters{$control->{charset}}) {
-        $converters{$control->{charset}} = Text::Iconv->new($control->{charset}, $db_charset);
-      }
-      $control->{description} = $converters{$control->{charset}}->convert($control->{description});
+      $control->{description} = SL::Iconv::convert($control->{charset}, $db_charset, $control->{description});

 
       $control->{"file"} =~ /\.(sql|pl)$/;
       my $file_type = $1;
 
       $control->{"file"} =~ /\.(sql|pl)$/;
       my $file_type = $1;

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c4f2a291d7f321f908f3a82d8634382ca0b71c30..77d8878ffdb1e7390b41a6e548830a8468eabded 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -36,6 +36,7 @@ use SL::CA;
 use SL::Form;
 use SL::User;
 use SL::USTVA;
 use SL::Form;
 use SL::User;
 use SL::USTVA;

+use SL::Iconv;

 use CGI::Ajax;
 use CGI;
 
 use CGI::Ajax;
 use CGI;
 


@@ -223,10 +224,11 @@ sub account_header {
           30 => "Ausserordentlicher Aufwand",
           31 => "Betriebliche Steuern");
   foreach $item (sort({ $a <=> $b } keys(%eur))) {
           30 => "Ausserordentlicher Aufwand",
           31 => "Betriebliche Steuern");
   foreach $item (sort({ $a <=> $b } keys(%eur))) {

+    my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $eur{$item}));

     if ($item == $form->{pos_eur}) {
     if ($item == $form->{pos_eur}) {

-      $select_eur .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $eur{$item}</option>\n|;
+      $select_eur .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;

     } else {
     } else {

-      $select_eur .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $eur{$item}</option>\n|;
+      $select_eur .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;

     }
 
   }
     }
 
   }


@@ -256,10 +258,11 @@ sub account_header {
              34 => 'Verr.kalk.Kosten',
              35 => 'Steuern Eink.u.Ertr.');
   foreach $item (sort({ $a <=> $b } keys %bwapos)) {
              34 => 'Verr.kalk.Kosten',
              35 => 'Steuern Eink.u.Ertr.');
   foreach $item (sort({ $a <=> $b } keys %bwapos)) {

+    my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $bwapos{$item}));

     if ($item == $form->{pos_bwa}) {
     if ($item == $form->{pos_bwa}) {

-      $select_bwa .= qq|<option value="$item" selected>|. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|;
+      $select_bwa .= qq|<option value="$item" selected>|. sprintf("%.2d", $item) .qq|. $text\n|;

     } else {
     } else {

-      $select_bwa .= qq|<option value="$item">|. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|;
+      $select_bwa .= qq|<option value="$item">|. sprintf("%.2d", $item) .qq|. $text\n|;

     }
 
   }
     }
 
   }

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index cc272249df3874a5aa2944e48af3b96c83b43c82..d7413ed36360457510572d812980a4a4eaad44f0 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -41,6 +41,7 @@ require "bin/mozilla/common.pl";
 use SL::PE;
 use SL::RP;
 use SL::USTVA;
 use SL::PE;
 use SL::RP;
 use SL::USTVA;

+use SL::Iconv;

 
 1;
 
 
 1;
 


@@ -2009,6 +2010,11 @@ sub print_form {
      " " => "_"
     );
 
      " " => "_"
     );
 

+  foreach my $key (keys %replacements) {
+    my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
+    $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
+  }
+

   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
   $form->{templates} = "$myconfig{templates}";
   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
   $form->{templates} = "$myconfig{templates}";