X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=25d742250a6572037ee6f4589a2cf54a4bd4a53f;hb=ef1b14d8b26228cacd68908b973d8eedc219975e;hp=f5c1640196d459251235cd328ebecf40396a6f07;hpb=c7a3cfda9336d765d387e9328f817d1f0e5230d1;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index f5c16401..25d74225 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -26,7 +26,7 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck carp);
 
 use strict;
 use vars qw(%dbglevel $fp $callback $cleandays $keepdays $dbgringlth);
@@ -85,25 +85,25 @@ if (!defined $DB::VERSION) {
 
 my $_isdbg;						# current dbg level we are processing
 
-sub dbg($)
+sub dbg
 {
-	return unless $fp;
+#	return unless $fp;
 	my $t = time; 
 	for (@_) {
 		my $r = $_;
 		chomp $r;
 		my @l = split /\n/, $r;
-		for (@l) {
-			s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-			print "$_\n" if defined \*STDOUT && !$no_stdout;
-			my $tag = $_isdbg ? "($_isdbg) " : '';
-			my $str = "$t^$tag$_";
+		foreach my $l (@l) {
+			$l =~ s/([\x00-\x08\x0B-\x1f\x7f-\xff])/sprintf("%%%02X",ord($1))/eg;
+			print "$l\n" if defined \*STDOUT && !$no_stdout;
+			my $tag = $_isdbg ? "($_isdbg) " : '(*) ';
+			my $str = "$t^$tag$l";
 			&$callback($str) if $callback;
 			if ($dbgringlth) {
 				shift @dbgring while (@dbgring > $dbgringlth);
 				push @dbgring, $str;
 			}
-			$fp->writeunix($t, $str) unless $dbglevel{"nolog$_isdbg"}; 
+			$fp->writeunix($t, $str) unless !$fp || $dbglevel{"nolog$_isdbg"} ; 
 		}
 	}
 	$_isdbg = '';