[Templates-cvs] cvs commit: TT3/lib/Template Base.pm

[cvs@template-toolkit.org]

cvs         04/12/10 18:34:46

  Modified:    lib/Template Base.pm
  Log:
  * fixed up some debug messages
  
  Revision  Changes    Path
  1.14      +10 -9     TT3/lib/Template/Base.pm
  
  Index: Base.pm
  ===================================================================
  RCS file: /template-toolkit/TT3/lib/Template/Base.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Base.pm	2004/12/10 13:34:29	1.13
  +++ Base.pm	2004/12/10 18:34:46	1.14
  @@ -16,7 +16,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Base.pm,v 1.13 2004/12/10 13:34:29 abw Exp $
  +#   $Id: Base.pm,v 1.14 2004/12/10 18:34:46 abw Exp $
   #
   #========================================================================
   
  @@ -29,7 +29,7 @@
   require Template::Utils;
   require Template::Exception;
   
  -our $VERSION   = sprintf("%d.%02d", q$Revision: 1.13 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION   = sprintf("%d.%02d", q$Revision: 1.14 $ =~ /(\d+)\.(\d+)/);
   our $DEBUG     = 0 unless defined $DEBUG;
   our $ERROR     = '';
   our $PAD       = '  ';
  @@ -56,7 +56,7 @@
           ? shift : { @_ };
   
       my $debug = defined $config->{ debug }
  -        ? $config->{ debug } : $class->pkgvar($DEBUG => $DEBUG);
  +        ? $config->{ debug } : $class->pkgvar( DEBUG => $DEBUG );
       
       my $self = bless {
           DEBUG => $debug,
  @@ -129,6 +129,7 @@
       no strict 'refs';
   
       while ($pkg = shift @pending) {
  +        $self->debug("looking for $name in $pkg\n") if $DEBUG;
           # iterate through each package in @pending looking for a
           # package variable named $name, skipping any packages we've
           # already seen and adding all base class packages (@ISA) to
  @@ -195,23 +196,23 @@
       foreach $key (@keys) {
           $uckey = uc $key;
           $self->debug("looking for $uckey in class [$class]  package [$pkg]\n")
  -            if $self->{ DEBUG };
  +            if $DEBUG;
   
           if (defined ($value = delete $config->{ $key })) {
               $self->debug("$key already defined in config: $value\n")
  -                if $self->{ DEBUG };
  +                if $DEBUG;
           }
           elsif (defined ($value = delete $config->{ $uckey })) {
               $self->debug("$uckey defined in config, copied to $key: $value\n")
  -                if $self->{ DEBUG };
  +                if $DEBUG;
           }
           elsif (defined ($value = ${"${class}::${uckey}"})) {
               $self->debug("got subclass value for ${class}::${uckey} : $value\n")
  -                if $self->{ DEBUG };
  +                if $DEBUG;
           }
           elsif (defined ($value = ${"${pkg}::${uckey}"})) {
               $self->debug("got package value for ${pkg}::${uckey} : $value\n")
  -                if $self->{ DEBUG };
  +                if $DEBUG;
           }
           else {
               return $self->error("no value provided for $key");
  @@ -1173,7 +1174,7 @@
   
   =head1 VERSION
   
  -$Revision: 1.13 $
  +$Revision: 1.14 $
   
   =head1 COPYRIGHT