X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9ef782591efbee3e837ba5b2ef879ca2eaea6ee9..1565e04fdb85bfd5f47adc09ce89bd4bcb230464:/SL/LXDebug.pm

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index c3a5a6485..72e097113 100644
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,7 +1,7 @@
 package LXDebug;
 
-use constant NONE => 0;
-use constant INFO => 1;
+use constant NONE   => 0;
+use constant INFO   => 1;
 use constant DEBUG1 => 2;
 use constant DEBUG2 => 3;
 
@@ -52,48 +52,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->_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 {