X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLXDebug.pm;h=10536c098656d2d0a28c921151f4cfaf5d1b354c;hb=633cdffb4418297756544062462caf416da746dc;hp=d1abcd0fbf5a6272419bc0896c05c8241d46f2a3;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index d1abcd0fb..10536c098 100644
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,14 +1,13 @@
 package LXDebug;
 
-use constant {
-  NONE => 0,
-  INFO => 1,
-  DEBUG1 => 2,
-  DEBUG2 => 3,
+use constant NONE   => 0;
+use constant INFO   => 1;
+use constant DEBUG1 => 2;
+use constant DEBUG2 => 3;
+use constant QUERY  => 4;
 
-  FILE_TARGET => 0,
-  STDERR_TARGET => 1
-  };
+use constant FILE_TARGET   => 0;
+use constant STDERR_TARGET => 1;
 
 use POSIX qw(strftime);
 
@@ -18,7 +17,7 @@ BEGIN {
   eval("use Data::Dumper");
   $data_dumper_available = $@ ? 0 : 1;
 
-  $global_level = NONE;
+  $global_level      = NONE;
   $global_trace_subs = 0;
 }
 
@@ -26,14 +25,14 @@ sub new {
   my $type = shift;
   my $self = {};
 
-  $self->{"calldepth"} = 0;
-  $self->{"file"} = "/tmp/lx-office-debug.log";
-  $self->{"target"} = FILE_TARGET;
-  $self->{"level"} = 0;
+  $self->{"calldepth"}  = 0;
+  $self->{"file"}       = "/tmp/lx-office-debug.log";
+  $self->{"target"}     = FILE_TARGET;
+  $self->{"level"}      = 0;
   $self->{"trace_subs"} = 0;
 
   while ($_[0]) {
-    $self->{$_[0]} = $_[1];
+    $self->{ $_[0] } = $_[1];
     shift;
     shift;
   }
@@ -45,7 +44,7 @@ sub set_target {
   my ($self, $target, $file) = @_;
 
   if ((FILE_TARGET == $target) && $file) {
-    $self->{"file"} = $file;
+    $self->{"file"}   = $file;
     $self->{"target"} = FILE_TARGET;
 
   } elsif (STDERR_TARGET == $target) {
@@ -54,46 +53,52 @@ sub set_target {
 }
 
 sub enter_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+
+  return 1 if $global_trace_subs < $level;
 
   if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
+    return 1;
   }
 
   my ($package, $filename, $line, $subroutine) = caller(1);
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
-  my $indent = "  " x $self->{"calldepth"};
+  my $indent = " " x $self->{"calldepth"};
   $self->{"calldepth"} += 1;
 
   if (!defined($package)) {
-    $self->_write("enter_sub", $indent . "top-level?\n");
+    $self->_write('sub', $indent . "\\ top-level?\n");
   } else {
-    $self->_write("enter_sub", $indent . "${subroutine} in " .
-                  "${self_filename}:${self_line} called from " .
-                  "${filename}:${line}\n");
+    $self->_write('sub', $indent
+                    . "\\ ${subroutine} in "
+                    . "${self_filename}:${self_line} called from "
+                    . "${filename}:${line}\n");
   }
+  return 1;
 }
 
 sub leave_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+
+  return 1 if $global_trace_subs < $level;
 
   if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
+    return 1;
   }
 
   my ($package, $filename, $line, $subroutine) = caller(1);
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
   $self->{"calldepth"} -= 1;
-  my $indent = "  " x $self->{"calldepth"};
+  my $indent = " " x $self->{"calldepth"};
 
   if (!defined($package)) {
-    $self->_write("leave_sub", $indent . "top-level?\n");
+    $self->_write('sub', $indent . "/ top-level?\n");
   } else {
-    $self->_write("leave_sub", $indent . "${subroutine} in " .
-                  "${self_filename}:${self_line}\n");
+    $self->_write('sub', $indent . "/ ${subroutine} in " . "${self_filename}:${self_line}\n");
   }
+  return 1;
 }
 
 sub message {
@@ -105,9 +110,11 @@ sub message {
   }
 
   if ($log_level >= $level) {
-    $self->_write(INFO == $level ? "info" :
-                  DEBUG1 == $level ? "debug1" : "debug2",
-                  $message);
+    $self->_write(INFO   == $level ? "info"
+                : DEBUG1 == $level ? "debug1" 
+                : DEBUG2 == $level ? "debug2"
+                : QUERY  == $level ? "query":"",
+                $message );
   }
 }
 
@@ -117,8 +124,9 @@ sub dump {
   if ($data_dumper_available) {
     $self->message($level, "dumping ${name}:\n" . Dumper($variable));
   } else {
-    $self->message($level, "dumping ${name}: Data::Dumper not available; " .
-                   "variable cannot be dumped");
+    $self->message($level,
+                   "dumping ${name}: Data::Dumper not available; "
+                     . "variable cannot be dumped");
   }
 }
 
@@ -129,7 +137,7 @@ sub enable_sub_tracing {
 
 sub disable_sub_tracing {
   my ($self) = @_;
-  $self->{"trace_subs"} = 1;
+  $self->{"trace_subs"} = 0;
 }
 
 sub _write {
@@ -139,12 +147,12 @@ sub _write {
 
   chomp($message);
 
-  if ((FILE_TARGET == $self->{"target"}) &&
-      open(FILE, ">>" . $self->{"file"})) {
+  if ((FILE_TARGET == $self->{"target"})
+      && open(FILE, ">>" . $self->{"file"})) {
     print(FILE "${date}${message}\n");
     close(FILE);
 
-  } elsif (STDERR_TARGET == $self->{"target"}) {
+      } elsif (STDERR_TARGET == $self->{"target"}) {
     print(STDERR "${date}${message}\n");
   }
 }