/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 8c6efb2a

Von Moritz Bunkus vor mehr als 18 Jahren hinzugefügt

ID 8c6efb2a9d807818596d7bee4fa9693ab833274c
Vorgänger 4c2287d7
Nachfolger ff7976ff

Trace Levels Hack. Wenn es koennen jetzt in den lxdebug->enter_sub und leave_sub Aufrufen Tracelevels uebergeben werden. Ist das global_trace_subs geringer, werden diese in den Traceausgaben ignoriert. Standardmaessig ist das jetzt bei Menu::access_control und Form::unescape der Fall.

Um (derzeit) alle Traceausgaben zu bekommen in der lx-erp.conf $global_trabce_subs = 2; setzen.

Debugausgaben entfernt.

parse_amount, format_amount und round_amount auf tracelevel 2 gesetzt. Trace breaker in parse_amount gefixt.

[Merge der Revisionen 943:945 957 aus dem LINET prog Repo]

     use HTML::Template;
     sub _input_to_hash {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my $input = $_[0];
       my %in    = ();
-...
         $in{$name} = unescape(undef, $value);
+      }
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return %in;
+    }
     sub _request_to_hash {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($input) = @_;
       my ($i,        $loc,  $key,    $val);
-...
+          }
+        }
         $main::lxdebug->leave_sub();
         $main::lxdebug->leave_sub(2);
         return %ATTACH;
           } else {
         $main::lxdebug->leave_sub();
         $main::lxdebug->leave_sub(2);
         return _input_to_hash($input);
+      }
+    }
-...
+    }
     sub escape {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $str, $beenthere) = @_;
-...
       $str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return $str;
+    }
     sub unescape {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $str) = @_;
-...
       $str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return $str;
+    }
-...
+    }
     sub format_amount {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $myconfig, $amount, $places, $dash) = @_;
-...
+        }
+      }
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return $amount;
+    }
     sub parse_amount {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $myconfig, $amount) = @_;
       $main::lxdebug->message(LXDebug::DEBUG2, "Start amount: $amount");
       if ($myconfig->{in_numberformat} == 1) {
         # Extra input number format 1000.00 or 1000,00
         $main::lxdebug->message(LXDebug::DEBUG2,
                   "in_numberformat: " . $main::locale->text('1000,00 or 1000.00'));
         $amount =~ s/,/\./g;
         #$main::lxdebug->message(LXDebug::DEBUG2, "1.Parsed Number: $amount") if ($amount);
         $amount = scalar reverse $amount;
         #$main::lxdebug->message(LXDebug::DEBUG2, "2.Parsed Number: $amount") if ($amount);
         $amount =~ s/\./DOT/;
         #$main::lxdebug->message(LXDebug::DEBUG2, "3.Parsed Number: $amount") if ($amount);
         $amount =~ s/\.//g;
         #$main::lxdebug->message(LXDebug::DEBUG2, "4.Parsed Number: $amount") if ($amount);
         $amount =~ s/DOT/\./;
         #$main::lxdebug->message(LXDebug::DEBUG2, "5.Parsed Number:" . $amount) if ($amount);
         $amount = scalar reverse $amount;
         $main::lxdebug->message(LXDebug::DEBUG2,
                                 "Parsed amount:" . $amount . "\n");
         $main::lxdebug->leave_sub(2);
         return ($amount * 1);
+      }
       $main::lxdebug->message(LXDebug::DEBUG2,
                   "in_numberformat: " . $main::locale->text('equal Outputformat'));
       $main::lxdebug->message(LXDebug::DEBUG2,
                               " = numberformat: $myconfig->{numberformat}");
       if (   ($myconfig->{numberformat} eq '1.000,00')
           || ($myconfig->{numberformat} eq '1000,00')) {
         $amount =~ s/\.//g;
-...
       $amount =~ s/,//g;
       $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount . "\n")
         if ($amount);
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return ($amount * 1);
+    }
     sub round_amount {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $amount, $places) = @_;
       my $round_amount;
-...
       $amount = $amount * (10**($places));
       $round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places));
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return $round_amount;

+    }
     sub enter_sub {
       my ($self) = @_;
       my ($self, $level) = @_;
       return if $global_trace_subs < $level;
       if (!$self->{"trace_subs"} && !$global_trace_subs) {
         return;
-...
+    }
     sub leave_sub {
       my ($self) = @_;
       my ($self, $level) = @_;
       return if $global_trace_subs < $level;
       if (!$self->{"trace_subs"} && !$global_trace_subs) {
         return;

+    }
     sub access_control {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my ($self, $myconfig, $menulevel) = @_;
-...
       @a = ();
       map { push @a, $_ unless $excl{$_} } (@menu);
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return @a;
+    }

     ## LINET
     sub calc_version {
       $main::lxdebug->enter_sub();
       $main::lxdebug->enter_sub(2);
       my (@v, $version, $i);
-...
         $version += $v[$i];
+      }
       $main::lxdebug->leave_sub();
       $main::lxdebug->leave_sub(2);
       return $version;
+    }
-...
           last if ($version < $mindb);
           # apply upgrade
           $main::lxdebug->message(DEBUG2, "Appliying Update $upgradescript");
           $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} . "-upgrade/$upgradescript", $str_maxdb);
           $version = $maxdb;

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 8c6efb2a

Von Moritz Bunkus vor mehr als 18 Jahren hinzugefügt