openinteract-commits

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

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

Modified Files:
	ErrorObject.pm 
Log Message:
cosmetic


Index: ErrorObject.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_error/OpenInteract/ErrorObject.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ErrorObject.pm	2001/09/06 14:34:54	1.4
--- ErrorObject.pm	2001/10/24 16:36:23	1.5
***************
*** 14,18 ****
  my $DEFAULT_TYPE   = 'n/a';
  
! # 
  # Routines to manipulate the list of errors during a request
  #
--- 14,18 ----
  my $DEFAULT_TYPE   = 'n/a';
  
! #
  # Routines to manipulate the list of errors during a request
  #
***************
*** 42,47 ****
  
  
! # Called when we do: OpenInteract::ErrorObject->new() 
! # (see SPOPS->new() for more info and how ->initialize() 
  # is called)
  
--- 42,47 ----
  
  
! # Called when we do: OpenInteract::ErrorObject->new()
! # (see SPOPS->new() for more info and how ->initialize()
  # is called)
  
***************
*** 66,72 ****
      my $extra_info = undef;
      foreach my $key ( keys %{ $p->{extra} } ) {
!         $R->DEBUG && $R->scrib( 1, "Set (tmp_$key) to $p->{extra}->{ $key }" );
!         $self->{ "tmp_$key" } = $p->{extra}->{ $key };
!         $extra_info .= $p->{extra}->{ $key } . "<br>\n";
      }
  
--- 66,72 ----
      my $extra_info = undef;
      foreach my $key ( keys %{ $p->{extra} } ) {
!         $R->DEBUG && $R->scrib( 1, "Set (tmp_$key) to $p->{extra}{ $key }" );
!         $self->{ "tmp_$key" } = $p->{extra}{ $key };
!         $extra_info .= $p->{extra}{ $key } . "<br>\n";
      }
  
***************
*** 87,91 ****
      # Get the action from $R if not already set
  
!     $p->{action} ||= $R->{current_context}->{action} || $DEFAULT_ACTION;
  
      # Give a default type if not set
--- 87,91 ----
      # Get the action from $R if not already set
  
!     $p->{action} ||= $R->{current_context}{action} || $DEFAULT_ACTION;
  
      # Give a default type if not set
***************
*** 113,119 ****
      # Set meta information
  
!     $self->{action}    ||= $R->{current_context}->{action};
!     $self->{user_id}     = $R->{auth}->{user}->id       if ( ref $R->{auth}->{user} );
!     $self->{session_id}  = $R->{session}->{_session_id} if ( ref $R->{session}   );
      $self->{browser}     = $head_in->{'User-Agent'};
      $self->{error_time}  = SPOPS::Utility->now;
--- 113,119 ----
      # Set meta information
  
!     $self->{action}    ||= $R->{current_context}{action};
!     $self->{user_id}     = $R->{auth}{user}->id       if ( ref $R->{auth}{user} );
!     $self->{session_id}  = $R->{session}{_session_id} if ( ref $R->{session}   );
      $self->{browser}     = $head_in->{'User-Agent'};
      $self->{error_time}  = SPOPS::Utility->now;
***************
*** 166,183 ****
  Messages
  
- ========
-     User
  ========
  $user_msg
  
  ========
!   System
! ========
  $sys_msg
  
  STRING
!     if ( $opt->{html} ) {
!         $string =~ s/\n/<br>\n/g;
!     }
      return $string;
  }
--- 166,179 ----
  Messages
  
  ========
+ User
  $user_msg
  
  ========
! System
  $sys_msg
  
  STRING
!     $string =~ s/\n/<br>\n/g if ( $opt->{html} );
      return $string;
  }