[Openinteract-commits] CVS: OpenInteract2/pkg/base_template/OpenInteract2/Action SiteTemplate.pm,1.14,1.15

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

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_template/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6150/OpenInteract2/Action

Modified Files:
	SiteTemplate.pm 
Log Message:
hopefully take care of those intermittent errors in OI2::Action::SiteTemplate where it complained that OI2::SiteTemplate wasn't loaded (couldn't find method 'create_name'...)


Index: SiteTemplate.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_template/OpenInteract2/Action/SiteTemplate.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SiteTemplate.pm	5 Dec 2004 08:51:20 -0000	1.14
--- SiteTemplate.pm	22 Sep 2005 04:08:07 -0000	1.15
***************
*** 8,11 ****
--- 8,12 ----
  use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Context   qw( CTX );
+ use OpenInteract2::SiteTemplate;
  use SPOPS::Secure            qw( SEC_LEVEL_WRITE );
  
***************
*** 21,30 ****
      my $website_dir = CTX->lookup_directory( 'website' );
      my $packages = CTX->repository->fetch_all_packages();
-     my $tmpl_class = CTX->lookup_class( 'template' );
      my %templates = ();
      foreach my $pkg ( @{ $packages } ) {
          eval {
              $templates{ $pkg->name } =
!                          $tmpl_class->fetch_by_package( $pkg->name );
          };
          if ( $@ ) {
--- 22,30 ----
      my $website_dir = CTX->lookup_directory( 'website' );
      my $packages = CTX->repository->fetch_all_packages();
      my %templates = ();
      foreach my $pkg ( @{ $packages } ) {
          eval {
              $templates{ $pkg->name } =
!                 OpenInteract2::SiteTemplate->fetch_by_package( $pkg->name );
          };
          if ( $@ ) {
***************
*** 36,40 ****
      # This looks weird but we're just finding the global templates
      eval {
!         $templates{ '' } = $tmpl_class->fetch_by_package( '' )
      };
      if ( $@ ) {
--- 36,41 ----
      # This looks weird but we're just finding the global templates
      eval {
!         $templates{ '' } =
!             OpenInteract2::SiteTemplate->fetch_by_package( '' )
      };
      if ( $@ ) {
***************
*** 64,68 ****
      $self->_set_package_info( \%params );
  
-     my $tmpl_class = CTX->lookup_class( 'template' );
      my $request = CTX->request;
      my $template = $self->param( 'template' );
--- 65,68 ----
***************
*** 71,76 ****
          my $name    = $request->param( 'name' );
          if ( $name ) {
!             my $fq_name = $tmpl_class->create_name( $package, $name );
!             $template = eval { $tmpl_class->fetch( $fq_name ) };
              if ( $@ || ! $template ) {
                  if ( $@ ) {
--- 71,79 ----
          my $name    = $request->param( 'name' );
          if ( $name ) {
!             my $fq_name =
!                 OpenInteract2::SiteTemplate->create_name( $package, $name );
!             $template = eval {
!                 OpenInteract2::SiteTemplate->fetch( $fq_name )
!             };
              if ( $@ || ! $template ) {
                  if ( $@ ) {
***************
*** 94,101 ****
  sub display_add {
      my ( $self ) = @_;
-     my $tmpl_class = CTX->lookup_class( 'template' );
  
      # We might have one leftover from a failed 'add'...
!     my $template = $self->param( 'template' ) || $tmpl_class->new;
  
      my %params = ( tmpl           => $template,
--- 97,104 ----
  sub display_add {
      my ( $self ) = @_;
  
      # We might have one leftover from a failed 'add'...
!     my $template = $self->param( 'template' )
!                    || OpenInteract2::SiteTemplate->new;
  
      my %params = ( tmpl           => $template,
***************
*** 121,127 ****
      my $name    = $request->param( 'name_original' );
  
!     my $tmpl_class = CTX->lookup_class( 'template' );
!     my $fq_name = $tmpl_class->create_name( $package, $name );
!     my $template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $@ or ! $template ) {
          if ( $@ ) {
--- 124,132 ----
      my $name    = $request->param( 'name_original' );
  
!     my $fq_name = OpenInteract2::SiteTemplate
!                       ->create_name( $package, $name );
!     my $template = eval {
!         OpenInteract2::SiteTemplate->fetch( $fq_name )
!     };
      if ( $@ or ! $template ) {
          if ( $@ ) {
***************
*** 162,167 ****
      my $request = CTX->request;
  
!     my $tmpl_class = CTX->lookup_class( 'template' );
!     my $template = $tmpl_class->new;
  
      my $package = $request->param( 'package' );
--- 167,171 ----
      my $request = CTX->request;
  
!     my $template = OpenInteract2::SiteTemplate->new;
  
      my $package = $request->param( 'package' );
***************
*** 173,178 ****
      $self->param( template => $template );
  
!     my $fq_name = $tmpl_class->create_name( $package, $name );
!     my $existing_template = eval { $tmpl_class->fetch( $fq_name ) };
      if ( $existing_template ) {
          $self->add_error_key( 'base_template.error.create_exists', $fq_name );
--- 177,185 ----
      $self->param( template => $template );
  
!     my $fq_name = OpenInteract2::SiteTemplate
!                       ->create_name( $package, $name );
!     my $existing_template = eval {
!         OpenInteract2::SiteTemplate->fetch( $fq_name )
!     };
      if ( $existing_template ) {
          $self->add_error_key( 'base_template.error.create_exists', $fq_name );
***************
*** 208,214 ****
          my $package = $request->param( 'package' );
          my $name    = $request->param( 'name' );
!         my $tmpl_class = CTX->lookup_class( 'template' );
!         $fq_name = $tmpl_class->create_name( $package, $name );
!         $template = eval { $tmpl_class->fetch( $fq_name ) };
          if ( $@ ) {
              $self->add_error_key( 'base_template.error.fetch', $fq_name, $@ );
--- 215,222 ----
          my $package = $request->param( 'package' );
          my $name    = $request->param( 'name' );
!         $fq_name = OpenInteract2::SiteTemplate->create_name( $package, $name );
!         $template = eval {
!             OpenInteract2::SiteTemplate->fetch( $fq_name )
!         };
          if ( $@ ) {
              $self->add_error_key( 'base_template.error.fetch', $fq_name, $@ );