[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/TT2 Provider.pm,1.4,1.5

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

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

Modified Files:
	Provider.pm 
Log Message:
OIN-73: sync up the HEAD/TAIL with how TT2 does it

Index: Provider.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2/Provider.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Provider.pm	18 Feb 2004 05:25:28 -0000	1.4
--- Provider.pm	2 Oct 2004 22:59:00 -0000	1.5
***************
*** 215,220 ****
      $log ||= get_logger( LOG_TEMPLATE );
  
!     $log->is_debug &&
!         $log->debug( "_refresh([ @$slot ])" );
  
      # If the cache time has expired reload the entry
--- 215,219 ----
      $log ||= get_logger( LOG_TEMPLATE );
  
!     $log->is_debug && $log->debug( "_refresh([ @$slot ])" );
  
      # If the cache time has expired reload the entry
***************
*** 225,236 ****
                           || DEFAULT_MAX_CACHE_TIME;
  	my ( $data, $error );
! 	if ( ( $slot->[ DATA ]->{time} - time ) > $max_cache_time ) {
          $log->is_debug &&
!             $log->debug( "Refresh cache for: $slot->[ NAME ]" );
          ( $data, $error ) = $self->_load( $slot->[ NAME ] );
-         ( $data, $error ) = $self->_compile( $data )  unless ( $error );
          unless ( $error ) {
!             $slot->[ DATA ] = $data->{data};
!             $slot->[ LOAD ] = $data->{time};
          }
  	}
--- 224,239 ----
                           || DEFAULT_MAX_CACHE_TIME;
  	my ( $data, $error );
!     my $elapsed_time = $slot->[ DATA ]->{time} - time;
! 	if ( $elapsed_time > $max_cache_time ) {
          $log->is_debug &&
!             $log->debug( "Doing refresh for ", $slot->[ NAME ], " ",
!                          "because $elapsed_time > $max_cache_time" );
          ( $data, $error ) = $self->_load( $slot->[ NAME ] );
          unless ( $error ) {
!             ( $data, $error ) = $self->_compile( $data );
!             unless ( $error ) {
!                 $slot->[ DATA ] = $data->{data};
!                 $slot->[ LOAD ] = $data->{time};
!             }
          }
  	}
***************
*** 238,261 ****
  	# remove existing slot from usage chain...
  
! 	if ( $slot->[ PREV ] ) {
! 		$slot->[ PREV ][ NEXT ] = $slot->[ NEXT ];
! 	}
!     else {
! 		$self->{HEAD} = $slot->[ NEXT ];
! 	}
  
! 	if ( $slot->[ NEXT ] ) {
! 		$slot->[ NEXT ][ PREV ] = $slot->[ PREV ];
! 	}
!     else {
! 		$self->{TAIL} = $slot->[ PREV ];
! 	}
  
- 	# ... and add to start of list
- 	my $head = $self->{ HEAD };
- 	$head->[ PREV ] = $slot if ( $head );
- 	$slot->[ PREV ] = undef;
- 	$slot->[ NEXT ] = $head;
- 	$self->{HEAD} = $slot;
  	return ( $data, $error );
  }
--- 241,266 ----
  	# remove existing slot from usage chain...
  
!     unless( $self->{ HEAD } == $slot ) {
!         if ( $slot->[ PREV ] ) {
!             $slot->[ PREV ][ NEXT ] = $slot->[ NEXT ];
!         }
!         else {
!             $self->{HEAD} = $slot->[ NEXT ];
!         }
!         if ( $slot->[ NEXT ] ) {
!             $slot->[ NEXT ][ PREV ] = $slot->[ PREV ];
!         }
!         else {
!             $self->{TAIL} = $slot->[ PREV ];
!         }
  
!         # ... and add to start of list
!         my $head = $self->{HEAD};
!         $head->[ PREV ] = $slot if ( $head );
!         $slot->[ PREV ] = undef;
!         $slot->[ NEXT ] = $head;
!         $self->{HEAD} = $slot;
!     }
  
  	return ( $data, $error );
  }
***************
*** 428,430 ****
  Robert McArthur E<lt>mca...@ds...E<gt>
  
! Authors of Slashcode L<http://www.slashcode.com/|http://www.slashcode.com/>
\ No newline at end of file
--- 433,435 ----
  Robert McArthur E<lt>mca...@ds...E<gt>
  
! Authors of Slashcode L<http://www.slashcode.com/|http://www.slashcode.com/>