[Openinteract-commits] CVS: OpenInteract2/pkg/news/OpenInteract2/Action News.pm,1.10,1.11

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

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

Modified Files:
	News.pm 
Log Message:
update packages to move as many messages as possible out of code and into message files; use new add_status/add_error shortcuts

Index: News.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Action/News.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** News.pm	25 Sep 2004 18:20:31 -0000	1.10
--- News.pm	5 Dec 2004 08:51:23 -0000	1.11
***************
*** 40,52 ****
                     num_items => $num_items );
      my $where = "active_on <= ? AND active = ? ";
!     my @values = ( OpenInteract2::Util->now, 'yes' );
      my $news_class = CTX->lookup_object( 'news' );
      my $items = eval {
!         $news_class->fetch_group({ where => $where,
!                                    value => \@values,
!                                    order => 'posted_on DESC',
!                                    limit => $num_items })
      };
!     $params{news_list} = $self->_massage_news_list( $items );
      return $self->generate_content( \%params );
  }
--- 40,59 ----
                     num_items => $num_items );
      my $where = "active_on <= ? AND active = ? ";
!     my @values = ( CTX->create_date, 'yes' );
      my $news_class = CTX->lookup_object( 'news' );
      my $items = eval {
!         $news_class->fetch_group({
!             where => $where,
!             value => \@values,
!             order => 'posted_on DESC',
!             limit => $num_items,
!         })
      };
!     if ( $@ ) {
!         $self->add_error_key( 'news.error.fetch_multiple', $@ );
!     }
!     else {
!         $params{news_list} = $self->_massage_news_list( $items );
!     }
      return $self->generate_content( \%params );
  }
***************
*** 285,296 ****
      $log ||= get_logger( LOG_APP );
  
!     my $sections = eval {
!         CTX->lookup_object( 'news_section' )
!            ->fetch_group({ order => 'section' })
!     };
!     if ( $@ ) {
!         $log->error( "Failed to get news sections: $@" );
!         $self->param_add( error_msg => "Failed to get news sections: $@" );
!     }
      my $news = eval {
          CTX->lookup_object( 'news' )
--- 292,296 ----
      $log ||= get_logger( LOG_APP );
  
!     my $sections = $self->_get_sections;
      my $news = eval {
          CTX->lookup_object( 'news' )
***************
*** 299,303 ****
      if ( $@ ) {
          $log->error( "Failed to get news objects: $@" );
!         $self->param_add( error_msg => "Failed to get news items: $@" );
      }
      return $self->generate_content(
--- 299,303 ----
      if ( $@ ) {
          $log->error( "Failed to get news objects: $@" );
!         $self->add_error_key( 'news.error.fetch_multiple', $@ );
      }
      return $self->generate_content(
***************
*** 320,326 ****
          my $news = eval { $news_class->fetch( $news_id ) };
          if ( $@ ) {
!             my $msg = "Failed to fetch news object [$news_id]: $@";
!             $log->error( $msg );
!             $self->param_add( error_msg => $msg );
              next NEWS;
          }
--- 320,325 ----
          my $news = eval { $news_class->fetch( $news_id ) };
          if ( $@ ) {
!             $log->error( "Cannot fetch news '$news_id': $@" );
!             $self->add_error_key( 'news.error.fetch', $news_id, $@ );
              next NEWS;
          }
***************
*** 330,336 ****
          eval { $news->save };
          if ( $@ ) {
!             my $msg = "Failed to save news object [$news_id]: $@";
!             $log->error( $msg );
!             $self->param_add( error_msg => $msg );
          }
          else {
--- 329,334 ----
          eval { $news->save };
          if ( $@ ) {
!             $log->error( "Failed to save news object '$news_id': $@" );
!             $self->add_error_key( 'news.error.save', $news_id, $@ );
          }
          else {
***************
*** 338,343 ****
          }
      }
!     $self->param_add(
!         status_msg => "Attempted: $attempt; successful updates $success" );
      $self->clear_cache();
      return $self->execute({ task => 'home' });
--- 336,340 ----
          }
      }
!     $self->add_status_key( 'news.status.multi_updates', $attempt, $success );
      $self->clear_cache();
      return $self->execute({ task => 'home' });
***************
*** 353,358 ****
      };
      if ( $@ ) {
!         my $msg = "Failed to retrieve news sections: $@";
!         $self->param_add( error_msg => $msg );
      }
      $sections ||= [];
--- 350,355 ----
      };
      if ( $@ ) {
!         $log->error( "Failed to get news sections: $@" );
!         $self->add_error_key( 'news.error.fetch_sections', $@ );
      }
      $sections ||= [];
***************
*** 360,363 ****
  }
  
- 
  1;
--- 357,359 ----