cvsuser 03/04/05 08:47:45
Modified: App-Context/lib/App Context.pm
Log:
sync
Revision Changes Path
1.8 +8 -17 p5ee/App-Context/lib/App/Context.pm
Index: Context.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Context/lib/App/Context.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Context.pm 22 Mar 2003 04:04:34 -0000 1.7
+++ Context.pm 5 Apr 2003 16:47:45 -0000 1.8
@@ -1,6 +1,6 @@
#############################################################################
-## $Id: Context.pm,v 1.7 2003/03/22 04:04:34 spadkins Exp $
+## $Id: Context.pm,v 1.8 2003/04/05 16:47:45 spadkins Exp $
#############################################################################
package App::Context;
@@ -570,27 +570,16 @@
if ($default eq "{today}") {
$default = time2str("%Y-%m-%d",time);
}
+ if (defined $default) {
$self->so_get($name, "", $default, 1);
- #if ($name =~ /^(.+)\.([^.]+)$/) {
- # $self->so_get($1, $2, $default, 1);
- #}
- #else {
- # $self->so_get("default", $name, $default, 1);
- #}
$self->so_delete($name, "default");
}
+ }
$class = $service->{class}; # find class of service
if (!defined $class || $class eq "") {
- #if ($name eq "default") {
$class = "App::$type"; # assume the "generic" class
- #}
- #else {
- # my $class_variant = ucfirst($name);
- # $class_variant =~ s/_([a-z])/uc($1)/ge;
- # $class = "App::${type}::${class_variant}";
- #}
$service->{class} = $class;
}
@@ -598,6 +587,8 @@
App->use($class);
$self->{used}{$class} = 1;
}
+ $self->dbgprint("Context->service() service class [$class]")
+ if ($App::DEBUG && $self->dbg(3));
bless $service, $class; # bless the service into the class
$session->{cache}{$type}{$name} = $service; # save in the cache