[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract Page.pm,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv14616/OpenInteract

Modified Files:
	Page.pm 
Log Message:
created 'storage' property, and updated object to deal with 'http'
storage method


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Page.pm	2001/10/24 23:04:12	1.3
--- Page.pm	2001/11/26 06:26:17	1.4
***************
*** 8,11 ****
--- 8,12 ----
  use OpenInteract::Page::Database;
  use OpenInteract::Page::File;
+ use OpenInteract::Page::Http;
  
  $OpenInteract::Page::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
***************
*** 25,33 ****
      my ( $class ) = @_;
      my $directory_list = eval { $class->db_select({
!                                         from            => $class->CONFIG->{table_name},
!                                         select          => [ 'directory, count(*)' ],
!                                         select_modifier => 'DISTINCT',
!                                         order           => 'directory',
!                                         group           => 'directory' }) };
      if ( $@ ) {
          my $R = OpenInteract::Request->instance;
--- 26,34 ----
      my ( $class ) = @_;
      my $directory_list = eval { $class->db_select({
!                                    from            => $class->CONFIG->{table_name},
!                                    select          => [ 'directory, count(*)' ],
!                                    select_modifier => 'DISTINCT',
!                                    order           => 'directory',
!                                    group           => 'directory' }) };
      if ( $@ ) {
          my $R = OpenInteract::Request->instance;
***************
*** 60,66 ****
  sub content {
      my ( $self ) = @_;
!     return $self->{content} = ( $self->{is_file} eq 'yes' )
!                                 ? OpenInteract::Page::File::load( $self )
!                                 : OpenInteract::Page::Database::load( $self );
  }
  
--- 61,73 ----
  sub content {
      my ( $self ) = @_;
!     if ( $self->{storage} eq 'file' ) {
!         return $self->{content} = OpenInteract::Page::File::load( $self );
!     }
!     if ( $self->{storage} eq 'database' ) {
!         return $self->{content} = OpenInteract::Page::Database::load( $self );
!     }
!     if ( $self->{storage} eq 'http' ) {
!         return $self->{content} = OpenInteract::Page::Http::load( $self );
!     }
  }