cvs commit: p5ee/P5EEx/Blue/P5EEx/Blue Context.pm

[Stephen Adkins]

cvsuser     02/12/30 10:57:01

  Modified:    P5EEx/Blue/P5EEx/Blue Context.pm
  Log:
  changed exception handling behavior
  
  Revision  Changes    Path
  1.42      +20 -13    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.41
  retrieving revision 1.42
  diff -u -w -r1.41 -r1.42
  --- Context.pm        19 Nov 2002 22:01:51 -0000      1.41
  +++ Context.pm        30 Dec 2002 18:57:01 -0000      1.42
  @@ -1,6 +1,6 @@
   
   #############################################################################
  -## $Id: Context.pm,v 1.41 2002/11/19 22:01:51 spadkins Exp $
  +## $Id: Context.pm,v 1.42 2002/12/30 18:57:01 spadkins Exp $
   #############################################################################
   
   package P5EEx::Blue::Context;
  @@ -200,7 +200,14 @@
   
       $config_class   = $args{configClass};
       $config_class   = $ENV{P5EE_CONFIG_CLASS} if (! $config_class);
  -    $config_class   = "P5EEx::Blue::Config::File" if (! $config_class);
  +    if (! $config_class) {
  +        if ($args->{config}) {
  +            $config_class = "P5EEx::Blue::Config";
  +        }
  +        else {
  +            $config_class = "P5EEx::Blue::Config::File";
  +        }
  +    }
   
       $session_class   = $args{sessionClass};
       $session_class   = "P5EEx::Blue::Session::HTMLHidden" if (! $session_class);
  @@ -214,10 +221,10 @@
           $self->dbgprint(join("",@str));
       }
   
  -    eval {
  +    #eval {
           $self->{config} = P5EEx::Blue::P5EE->new($config_class, "new", \%args);
  -    };
  -    $self->add_message($@) if ($@);
  +    #};
  +    #$self->add_message($@) if ($@);
   
       #################################################################
       # DEBUGGING
  @@ -254,18 +261,18 @@
   
       $self->init(\%args);
   
  -    eval {
           $self->dbgprint("Context->new(): configClass=$config_class 
sessionClass=$session_class (", join(",",%args), ")")
               if ($P5EEx::Blue::DEBUG && $self->dbg(1));
   
  +    #eval {
           $self->{session} = P5EEx::Blue::P5EE->new($session_class, "new", \%args);
  -    };
  -    $self->add_message($@) if ($@);
  +    #};
  +    #$self->add_message($@) if ($@);
   
  -    eval {
  +    #eval {
           $self->{user_agent} = P5EEx::Blue::UserAgent->new($self);
  -    };
  -    $self->add_message($@) if ($@);
  +    #};
  +    #$self->add_message($@) if ($@);
   
       return $self;
   }