[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Request Apache.pm,1.15,1.16 Apache2.pm,1.1,1.2 CGI.pm,1.19,1.20 LWP.pm,1.20,1.21 Standalone.pm,1.12,1.13

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/lib/OpenInteract2/Request

Modified Files:
	Apache.pm Apache2.pm CGI.pm LWP.pm Standalone.pm 
Log Message:
update OI2::Request implementations to pass the full URL -- with GET query arguments -- to assign_request_url()

Index: Apache.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Apache.pm	7 Jun 2004 01:19:18 -0000	1.15
--- Apache.pm	28 Nov 2004 17:50:46 -0000	1.16
***************
*** 38,44 ****
      # Set the URI and parse it
  
!     $self->assign_request_url( $apache->uri );
  
!     # Setup the GET/SET params
  
      my $num_param = 0;
--- 38,49 ----
      # Set the URI and parse it
  
!     my $full_uri = $apache->uri;
!     my $query_args = $apache->args;
!     if ( $query_args ) {
!         $full_uri .= "?$query_args";
!     }
!     $self->assign_request_url( $full_uri );
  
!     # Setup the GET/POST params
  
      my $num_param = 0;
***************
*** 61,70 ****
      foreach my $upload ( $self->apache->upload() ) {
          my $oi_upload = OpenInteract2::Upload->new({
!                               name         => $upload->name,
!                               content_type => $upload->type,
!                               size         => $upload->size,
!                               filehandle   => $upload->fh,
!                               filename     => $upload->filename,
!                               tmp_name     => $upload->tempname });
          $self->_set_upload( $upload->name, $oi_upload );
          $num_uploads++;
--- 66,76 ----
      foreach my $upload ( $self->apache->upload() ) {
          my $oi_upload = OpenInteract2::Upload->new({
!             name         => $upload->name,
!             content_type => $upload->type,
!             size         => $upload->size,
!             filehandle   => $upload->fh,
!             filename     => $upload->filename,
!             tmp_name     => $upload->tempname
!         });
          $self->_set_upload( $upload->name, $oi_upload );
          $num_uploads++;

Index: Apache2.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache2.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Apache2.pm	19 Feb 2004 04:10:37 -0000	1.1
--- Apache2.pm	28 Nov 2004 17:50:46 -0000	1.2
***************
*** 44,51 ****
      }
  
!     my $request_path = $r->parsed_uri->path;
!     $log->is_debug &&
!         $log->debug( "Got URL from apache '$request_path'" );
!     $self->assign_request_url( $request_path );
  
      # HACK!
--- 44,55 ----
      }
  
!     my $apache_uri = $r->parsed_uri;
!     my $full_url   = $apache_uri->path;
!     my $query_args = $apache_uri->query;
!     if ( $query_args ) {
!         $full_url .= "?$query_args";
!     }
!     $log->is_debug && $log->debug( "Got URL from apache2 '$full_url'" );
!     $self->assign_request_url( $full_url );
  
      # HACK!

Index: CGI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/CGI.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** CGI.pm	22 Sep 2004 03:09:34 -0000	1.19
--- CGI.pm	28 Nov 2004 17:50:46 -0000	1.20
***************
*** 42,47 ****
  
      my $full_url = join( '', $base_url, $cgi->path_info );
!     $log->is_debug &&
!         $log->debug( "Full OI URL '$full_url'" );
      $self->assign_request_url( $full_url );
  
--- 42,50 ----
  
      my $full_url = join( '', $base_url, $cgi->path_info );
!     my $query_args = $cgi->query_string;
!     if ( $query_args ) {
!         $full_url .= "?$query_args";
!     }
!     $log->is_debug && $log->debug( "Full OI URL from CGI: $full_url" );
      $self->assign_request_url( $full_url );
  

Index: LWP.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/LWP.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** LWP.pm	22 Sep 2004 03:09:34 -0000	1.20
--- LWP.pm	28 Nov 2004 17:50:46 -0000	1.21
***************
*** 31,34 ****
--- 31,35 ----
      $self->lwp( $lwp_request );
  
+     # TODO: check to see that this has the query args on it
      $self->assign_request_url( $lwp_request->uri );
  

Index: Standalone.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Standalone.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Standalone.pm	22 Sep 2004 03:09:34 -0000	1.12
--- Standalone.pm	28 Nov 2004 17:50:46 -0000	1.13
***************
*** 28,33 ****
      $self->_check_properties( $props );
  
!     $log->is_debug &&
!         $log->debug( "Full OI URL [$props->{url}]" );
      $self->assign_request_url( $props->{url} );
  
--- 28,32 ----
      $self->_check_properties( $props );
  
!     $log->is_debug && $log->debug( "Full URL from property: $props->{url}" );
      $self->assign_request_url( $props->{url} );