Mehr Debugmöglichkeiten für DBUtils.pm und allgemein für Fehlersituationen eingeführt...

diff --git a/SL/DBUtils.pm b/SL/DBUtils.pm
index 8e1ea811a746841fd77c941fb1966ccf902ad670..fd2873ebfe232a4090ff1ec0864df989dcf6c56c 100644 (file)
--- a/SL/DBUtils.pm
+++ b/SL/DBUtils.pm
@@ -29,6 +29,8 @@ sub conv_dateq {
 }
 
 sub do_query {
 }
 
 sub do_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);


@@ -39,11 +41,15 @@ sub do_query {
     $dbh->do($query, undef, @_) ||
       $form->dberror($query . " (" . join(", ", @_) . ")");
   }
     $dbh->do($query, undef, @_) ||
       $form->dberror($query . " (" . join(", ", @_) . ")");
   }

+
+  $main::lxdebug->leave_sub(2);

 }
 
 sub selectrow_query { &selectfirst_array_query }
 
 sub do_statement {
 }
 
 sub selectrow_query { &selectfirst_array_query }
 
 sub do_statement {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $sth, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);
   my ($form, $sth, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);


@@ -54,6 +60,8 @@ sub do_statement {
     $sth->execute(@_) ||
       $form->dberror($query . " (" . join(", ", @_) . ")");
   }
     $sth->execute(@_) ||
       $form->dberror($query . " (" . join(", ", @_) . ")");
   }

+
+  $main::lxdebug->leave_sub(2);

 }
 
 sub dump_query {
 }
 
 sub dump_query {


@@ -84,15 +92,22 @@ sub quote_db_date {
 }
 
 sub prepare_query {
 }
 
 sub prepare_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);
 
   my $sth = $dbh->prepare($query) || $form->dberror($query);
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);
 
   my $sth = $dbh->prepare($query) || $form->dberror($query);

+
+  $main::lxdebug->leave_sub(2);
+

   return $sth;
 }
 
 sub prepare_execute_query {
   return $sth;
 }
 
 sub prepare_execute_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   dump_query(LXDebug::QUERY, '', $query, @_);


@@ -104,10 +119,14 @@ sub prepare_execute_query {
     $sth->execute() || $form->dberror($query);
   }
 
     $sth->execute() || $form->dberror($query);
   }
 

+  $main::lxdebug->leave_sub(2);
+

   return $sth;
 }
 
 sub selectall_hashref_query {
   return $sth;
 }
 
 sub selectall_hashref_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);


@@ -117,10 +136,14 @@ sub selectall_hashref_query {
   }
   $sth->finish();
 
   }
   $sth->finish();
 

+  $main::lxdebug->leave_sub(2);
+

   return $result;
 }
 
 sub selectall_array_query {
   return $result;
 }
 
 sub selectall_array_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);


@@ -130,26 +153,36 @@ sub selectall_array_query {
   }
   $sth->finish();
 
   }
   $sth->finish();
 

+  $main::lxdebug->leave_sub(2);
+

   return @result;
 }
 
 sub selectfirst_hashref_query {
   return @result;
 }
 
 sub selectfirst_hashref_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my $ref = $sth->fetchrow_hashref();
   $sth->finish();
 
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my $ref = $sth->fetchrow_hashref();
   $sth->finish();
 

+  $main::lxdebug->leave_sub(2);
+

   return $ref;
 }
 
 sub selectfirst_array_query {
   return $ref;
 }
 
 sub selectfirst_array_query {

+  $main::lxdebug->enter_sub(2);
+

   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my @ret = $sth->fetchrow_array();
   $sth->finish();
 
   my ($form, $dbh, $query) = splice(@_, 0, 3);
 
   my $sth = prepare_execute_query($form, $dbh, $query, @_);
   my @ret = $sth->fetchrow_array();
   $sth->finish();
 

+  $main::lxdebug->leave_sub(2);
+

   return @ret;
 }
 
   return @ret;
 }
 

diff --git a/SL/Form.pm b/SL/Form.pm
index 6aedf1d6e5a6131b3995791449e19b15deee1f47..77d8307c3db46ee57f2cff18d247c12f5b81bd8b 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -258,6 +258,8 @@ sub hide_form {
 sub error {
   $main::lxdebug->enter_sub();
 
 sub error {
   $main::lxdebug->enter_sub();
 

+  $main::lxdebug->full_error_call_trace();
+

   my ($self, $msg) = @_;
   if ($ENV{HTTP_USER_AGENT}) {
     $msg =~ s/\n/<br>/g;
   my ($self, $msg) = @_;
   if ($ENV{HTTP_USER_AGENT}) {
     $msg =~ s/\n/<br>/g;

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index 8a4dd29235cc96b0264ae62fd47c53a089f80d17..f59e610113e597d0e58a404a7febeaf83514833c 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,12 +1,13 @@
 package LXDebug;
 
 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 ALL    => 31;
+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 CALL_TRACE_ON_ERROR => 32;
+use constant ALL                 => 63;

 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;


@@ -99,6 +100,21 @@ sub leave_sub {
   return 1;
 }
 
   return 1;
 }
 

+sub full_error_call_trace {
+  my ($self) = @_;
+
+  return 1 unless ($global_level & CALL_TRACE_ON_ERROR);
+
+  $self->message(CALL_TRACE_ON_ERROR, "Starting full caller dump:");
+  my $level = 0;
+  while (my ($dummy, $filename, $line, $subroutine) = caller $level) {
+    $self->message(CALL_TRACE_ON_ERROR, "${subroutine} from ${filename}:${line}");
+    $level++;
+  }
+
+  return 1;
+}
+

 sub message {
   my ($self, $level, $message) = @_;
 
 sub message {
   my ($self, $level, $message) = @_;
 


@@ -146,7 +162,7 @@ sub _write {
 
 sub level2string {
   # use $_[0] as a bit mask and return levelstrings separated by /
 
 sub level2string {
   # use $_[0] as a bit mask and return levelstrings separated by /

-  join '/', qw(info debug1 debug2 query trace)[ grep { (reverse split //, sprintf "%05b", $_[0])[$_] } 0..4 ]
+  join '/', qw(info debug1 debug2 query trace error_call_trace)[ grep { (reverse split //, sprintf "%05b", $_[0])[$_] } 0..5 ]

 }
 
 1;
 }
 
 1;

diff --git a/lx-erp.conf b/lx-erp.conf
index 8ab6ce8d1319b902bb2eafdc5d75166d049a9eb1..1bf3895802d8d4fc35f3efe9426aaddcf221afe1 100644 (file)
--- a/lx-erp.conf
+++ b/lx-erp.conf
@@ -77,6 +77,7 @@ $dbcharset = "ISO-8859-15";
 # LXDebug::DEBUG2 
 # LXDebug::QUERY  - SQL Queries 
 # LXDebug::TRACE  - Tracing von Funktionsaufrufen
 # LXDebug::DEBUG2 
 # LXDebug::QUERY  - SQL Queries 
 # LXDebug::TRACE  - Tracing von Funktionsaufrufen

+# LXDebug::CALL_TRACE_ON_ERROR - Vollständiger Aufrufpfad, wenn $form->error() aufgerufen wird

 # LXDebug::ALL    - alle Debugausgaben
 #
 # Beipiel: 
 # LXDebug::ALL    - alle Debugausgaben
 #
 # Beipiel: