cvsuser 02/03/19 14:40:54
Modified: P5EEx/Blue/P5EEx/Blue Context.pm
Log:
refined dbg(), added shared_datastore()/shared_resource_set()
Revision Changes Path
1.22 +35 -20 p5ee/P5EEx/Blue/P5EEx/Blue/Context.pm
Index: Context.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Context.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- Context.pm 12 Mar 2002 17:03:52 -0000 1.21
+++ Context.pm 19 Mar 2002 22:40:54 -0000 1.22
@@ -1,6 +1,6 @@
#############################################################################
-## $Id: Context.pm,v 1.21 2002/03/12 17:03:52 spadkins Exp $
+## $Id: Context.pm,v 1.22 2002/03/19 22:40:54 spadkins Exp $
#############################################################################
package P5EEx::Blue::Context;
@@ -544,13 +544,17 @@
=head2 widget()
-=head2 template()
+=head2 template_engine()
=head2 messaging()
=head2 procedure()
-=head2 logchannel()
+=head2 log_channel()
+
+=head2 shared_datastore()
+
+=head2 shared_resource_set()
These are all convenience methods, which simply turn around
and call the service() method with the service type as the
@@ -569,8 +573,10 @@
$session = $context->session();
$repository = $context->repository();
$security = $context->security();
- $template = $context->template();
- $logchannel = $context->logchannel();
+ $template_engine = $context->template_engine();
+ $log_channel = $context->log_channel();
+ $shared_datastore = $context->shared_datastore();
+ $shared_resource_set = $context->shared_resource_set();
=cut
@@ -580,7 +586,9 @@
sub template_engine { my $self = shift; return $self->service("TemplateEngine",@_);
}
sub messaging { my $self = shift; return $self->service("Messaging",@_); }
sub procedure { my $self = shift; return $self->service("Procedure",@_); }
-sub logchannel { my $self = shift; return $self->service("LogChannel",@_); }
+sub log_channel { my $self = shift; return $self->service("LogChannel",@_);
}
+sub shared_datastore { my $self = shift; return
$self->service("SharedDatastore",@_); }
+sub shared_resource_set { my $self = shift; return
$self->service("SharedResourceSet",@_); }
#############################################################################
# widget_exists()
@@ -1243,15 +1251,22 @@
sub dbg {
my ($self, $level) = @_;
- $level = 1 if (!defined $level);
- my ($class, $file, $line, $method, $hasargs, $wantarray) = caller(1);
return 0 if (! $P5EEx::Blue::DEBUG);
+ $level = 1 if (!defined $level);
return 0 if (defined $level && $P5EEx::Blue::DEBUG < $level);
- my $debugscope = (ref($self) eq "") ? \%debugscope : $self->{debugscope};
+ my ($debugscope, $stacklevel);
+ my ($package, $file, $line, $subroutine, $hasargs, $wantarray);
+ $debugscope = (ref($self) eq "") ? \%debugscope : $self->{debugscope};
+ $stacklevel = 1;
+ ($package, $file, $line, $subroutine, $hasargs, $wantarray) =
caller($stacklevel);
+ while (defined $subroutine && $subroutine eq "(eval)") {
+ $stacklevel++;
+ ($package, $file, $line, $subroutine, $hasargs, $wantarray) =
caller($stacklevel);
+ }
return 1 if (! defined $debugscope);
return 1 if (! %$debugscope);
- return 1 if (defined $debugscope->{$class});
- return 1 if (defined $method && defined $debugscope->{"$class.$method"});
+ return 1 if (defined $debugscope->{$package});
+ return 1 if (defined $debugscope->{$subroutine});
return 0;
}
