SF.net SVN: ledger-smb:[4185] branches/1.3

[..hidden..]

Revision: 4185
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4185&view=rev
Author:   einhverfr
Date:     2011-12-09 14:05:49 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Reduced warnings in the logs

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB.pm

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-12-09 13:45:49 UTC (rev 4184)
+++ branches/1.3/Changelog	2011-12-09 14:05:49 UTC (rev 4185)
@@ -11,6 +11,7 @@
 * Better handling of successive logouts (Herman V)
 * Correcting some erroneous errors on db setup (Herman V)
 * Corrected error message in old handler (Herman V)
+* Reduced warnings in logs (Herman V and Chris T)
 
 Changelog for 1.3.8:
 * Fixed duplicate key error saving taxes (Herman V)

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2011-12-09 13:45:49 UTC (rev 4184)
+++ branches/1.3/LedgerSMB/Form.pm	2011-12-09 14:05:49 UTC (rev 4185)
@@ -135,8 +135,12 @@
     if ( substr( $self->{action}, 0, 1 ) !~ /( |\.)/ ) {
         $self->{action} = lc $self->{action};
         $self->{action} =~ s/( |-|,|\#|\/|\.$)/_/g;
-        $self->{nextsub} = lc $self->{nextsub};
-        $self->{nextsub} =~ s/( |-|,|\#|\/|\.$)/_/g;
+        if (defined $self->{nextsub}){
+            $self->{nextsub} = lc $self->{nextsub};
+            $self->{nextsub} =~ s/( |-|,|\#|\/|\.$)/_/g;
+        } else { 
+            $self->{nextsub} = '';
+        }
     }
 
     $self->{login} = "" unless defined $self->{login};

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2011-12-09 13:45:49 UTC (rev 4184)
+++ branches/1.3/LedgerSMB.pm	2011-12-09 14:05:49 UTC (rev 4185)
@@ -1119,7 +1119,9 @@
 sub merge {
     (my $package,my $filename,my $line)=caller;
     my ( $self, $src ) = @_;
-    $logger->debug("begin caller \$filename=$filename \$line=$line \$self->{dbh}=$self->{dbh}");
+    $logger->debug("begin caller \$filename=$filename \$line=$line");
+       # Removed dbh from logging string since not used on this api call and
+       # not initialized in test cases -CT
     for my $arg ( $self, $src ) {
         shift;
     }
@@ -1158,7 +1160,7 @@
         }
         $self->{$dst_arg} = $src->{$arg};
     }
-    $logger->debug("end caller \$filename=$filename \$line=$line \$self->{dbh}=$self->{dbh}");
+    $logger->debug("end caller \$filename=$filename \$line=$line");
 }
 
 sub type {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.