Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1168/lib/OpenInteract2
Modified Files:
Request.pm
Log Message:
add OpenInteract2::ParamContainer to ISA, remove old methods and modify docs to reflect; also move URL-parsing methods to OI2::ActionResolver::NameAndTask
Index: Request.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Request.pm 2 Feb 2005 13:13:50 -0000 1.49
--- Request.pm 13 Feb 2005 20:18:35 -0000 1.50
***************
*** 4,8 ****
use strict;
! use base qw( Class::Factory Class::Accessor::Fast );
use Log::Log4perl qw( get_logger );
use DateTime;
--- 4,8 ----
use strict;
! use base qw( OpenInteract2::ParamContainer Class::Factory Class::Accessor::Fast );
use Log::Log4perl qw( get_logger );
use DateTime;
***************
*** 23,33 ****
# ACCESSORS
! my @FIELDS = qw(
now server_name remote_host
user_agent referer cookie_header language_header
! url_absolute url_relative url_initial action_name task_name
session auth_user auth_group auth_is_admin auth_is_logged_in
);
! __PACKAGE__->mk_accessors( @FIELDS );
my ( $REQUEST_TYPE, $REQUEST_CLASS );
--- 23,35 ----
# ACCESSORS
! my %FIELDS = map { $_ => 1 } qw(
now server_name remote_host
user_agent referer cookie_header language_header
! url_absolute url_relative url_initial
session auth_user auth_group auth_is_admin auth_is_logged_in
);
! __PACKAGE__->mk_accessors( keys %FIELDS );
!
! sub get_skip_params { return %FIELDS }
my ( $REQUEST_TYPE, $REQUEST_CLASS );
***************
*** 77,102 ****
# PARAMETERS
- sub param {
- my ( $self, $name, $value ) = @_;
- unless ( $name ) {
- return keys %{ $self->{_param} };
- }
- if ( defined $value ) {
- $self->{_param}{ $name } = $value;
- }
- if ( ref $self->{_param}{ $name } eq 'ARRAY' ) {
- return ( wantarray )
- ? @{ $self->{_param}{ $name } }
- : $self->{_param}{ $name };
- }
- if ( exists $self->{_param}{ $name } ) {
- return ( wantarray )
- ? ( $self->{_param}{ $name } )
- : $self->{_param}{ $name };
- }
- return wantarray ? () : undef;
- }
-
-
sub param_toggled {
my ( $self, $name ) = @_;
--- 79,82 ----
***************
*** 175,199 ****
$log->debug( "Setting relative URL '$relative_url'" );
$self->url_relative( $relative_url );
-
- my ( $action_url, $task ) = OpenInteract2::URL->parse( $relative_url );
- $self->url_initial( $action_url );
- my ( $action_name );
- if ( $action_url ) {
- $action_name = eval { CTX->lookup_action_name( $action_url ) };
- if ( $@ ) {
- my $action_nf = CTX->lookup_action_not_found();
- $action_name = $action_nf->name;
- }
- }
- else {
- my $action_none = CTX->lookup_action_none();
- $action_name = $action_none->name;
- }
- $action_name ||= '';
- $task ||= '';
- $self->action_name( $action_name );
- $self->task_name( $task );
- $log->is_info &&
- $log->info( "Pulled action info '$action_name: $task' from URL" );
return $relative_url;
}
--- 155,158 ----
|
