X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLXDebug.pm;h=3dbd14fe0ac45cbf640b632b7590f464ebfef71d;hb=97c5490acd4c17a4b441e455e0ded66557e5fc58;hp=16ecf9af5fe9257f6caa103483c996d849e747f6;hpb=91aac6c6ce0775d1236d1c2de9c477a9b3f4adf8;p=kivitendo-erp.git

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index 16ecf9af5..3dbd14fe0 100644
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,13 +1,14 @@
 package LXDebug;
 
-use constant NONE               => 0;
-use constant INFO               => 1;
-use constant DEBUG1             => 2;
-use constant DEBUG2             => 4;
-use constant QUERY              => 8;
-use constant TRACE              => 16;
-use constant BACKTRACE_ON_ERROR => 32;
-use constant ALL                => 63;
+use constant NONE               =>  0;
+use constant INFO               =>  1;
+use constant DEBUG1             =>  1 << 1;
+use constant DEBUG2             =>  1 << 2;
+use constant QUERY              =>  1 << 3;
+use constant TRACE              =>  1 << 4;
+use constant BACKTRACE_ON_ERROR =>  1 << 5;
+use constant ALL                => (1 << 6) - 1;
+use constant DEVEL              => INFO | QUERY | TRACE | BACKTRACE_ON_ERROR;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
@@ -16,6 +17,8 @@ use POSIX qw(strftime);
 
 use YAML;
 
+use strict;
+
 my $data_dumper_available;
 
 our $global_level;
@@ -103,9 +106,9 @@ sub leave_sub {
 }
 
 sub show_backtrace {
-  my ($self) = @_;
+  my ($self, $force) = @_;
 
-  return 1 unless ($global_level & BACKTRACE_ON_ERROR);
+  return 1 unless ($force || ($global_level & BACKTRACE_ON_ERROR));
 
   $self->message(BACKTRACE_ON_ERROR, "Starting full caller dump:");
   my $level = 0;
@@ -127,9 +130,25 @@ sub dump {
   my ($self, $level, $name, $variable) = @_;
 
   if ($data_dumper_available) {
+    my $password;
+    if ($variable && ('Form' eq ref $variable) && defined $variable->{password}) {
+      $password             = $variable->{password};
+      $variable->{password} = 'X' x 8;
+    }
+
     my $dumper = Data::Dumper->new([$variable]);
     $dumper->Sortkeys(1);
     $self->message($level, "dumping ${name}:\n" . $dumper->Dump());
+
+    $variable->{password} = $password if (defined $password);
+
+    # Data::Dumper does not reset the iterator belonging to this hash
+    # if 'Sortkeys' is true. Therefore clear the iterator manually.
+    # See "perldoc -f each".
+    if ($variable && (('HASH' eq ref $variable) || ('Form' eq ref $variable))) {
+      keys %{ $variable };
+    }
+
   } else {
     $self->message($level,
                    "dumping ${name}: Data::Dumper not available; "
@@ -143,6 +162,34 @@ sub dump_yaml {
   $self->message($level, "dumping ${name}:\n" . YAML::Dump($variable));
 }
 
+sub dump_sql_result {
+  my ($self, $level, $prefix, $results) = @_;
+
+  if (!$results || !scalar @{ $results }) {
+    $self->message($level, "Empty result set");
+    return;
+  }
+
+  my %column_lengths = map { $_, length $_ } keys %{ $results->[0] };
+
+  foreach my $row (@{ $results }) {
+    map { $column_lengths{$_} = length $row->{$_} if (length $row->{$_} > $column_lengths{$_}) } keys %{ $row };
+  }
+
+  my @sorted_names = sort keys %column_lengths;
+  my $format       = join '|', map { '%' . $column_lengths{$_} . 's' } @sorted_names;
+
+  $prefix .= ' ' if $prefix;
+
+  $self->message($level, $prefix . sprintf($format, @sorted_names));
+  $self->message($level, $prefix . join('+', map { '-' x $column_lengths{$_} } @sorted_names));
+
+  foreach my $row (@{ $results }) {
+    $self->message($level, $prefix . sprintf($format, map { $row->{$_} } @sorted_names));
+  }
+  $self->message($level, $prefix . sprintf('(%d row%s)', scalar @{ $results }, scalar @{ $results } > 1 ? 's' : ''));
+}
+
 sub enable_sub_tracing {
   my ($self) = @_;
   $self->{level} | TRACE;