cvs commit: p5ee/App-Repository/lib/App/SessionObject RepositoryObjectSet.pm

cvsuser     06/02/24 06:32:27

  Modified:    App-Repository/lib/App/SessionObject RepositoryObjectSet.pm
  Log:
  add max_age feature on the object set to serve as default if not provided in get_objects({max_age => 0}) calls
  
  Revision  Changes    Path
  1.10      +9 -8      p5ee/App-Repository/lib/App/SessionObject/RepositoryObjectSet.pm
  
  Index: RepositoryObjectSet.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/lib/App/SessionObject/RepositoryObjectSet.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RepositoryObjectSet.pm	8 Feb 2006 22:12:10 -0000	1.9
  +++ RepositoryObjectSet.pm	24 Feb 2006 14:32:26 -0000	1.10
  @@ -76,8 +76,9 @@
   sub _clear_cache_if_objects_expired {
       &App::sub_entry if ($App::trace);
       my ($self, $options) = @_;
  -    if (defined $options->{max_age} && $self->{objects}) {
  -        my $max_age = $options->{max_age};
  +    my $max_age = $options->{max_age};
  +    $max_age = $self->{max_age} if (!defined $max_age);
  +    if (defined $max_age && $self->{objects}) {
           my $max_age_time = $self->{max_age_time};
           my $time = time();
           if (defined $max_age_time && $max_age_time <= $time - $max_age) {
  @@ -274,7 +275,7 @@
       my $key_columns = shift;
   
       $self->_clear_cache_if_auto_params_changed($options) if (defined $self->{auto_params});
  -    $self->_clear_cache_if_objects_expired($options) if (defined $options->{max_age} && $self->{objects});
  +    $self->_clear_cache_if_objects_expired($options) if ((defined $options->{max_age} || defined $self->{max_age}) && $self->{objects});
   
       my $index = $self->{index}{$key_name};
       if (!$index) {
  @@ -312,7 +313,7 @@
       my $key_columns = shift;
   
       $self->_clear_cache_if_auto_params_changed($options) if (defined $self->{auto_params});
  -    $self->_clear_cache_if_objects_expired($options) if (defined $options->{max_age} && $self->{objects});
  +    $self->_clear_cache_if_objects_expired($options) if ((defined $options->{max_age} || defined $self->{max_age}) && $self->{objects});
   
       my $unique_index = $self->{unique_index}{$key_name};
       if (!$unique_index) {
  @@ -338,7 +339,7 @@
       my ($self, $column, $options) = @_;
   
       $self->_clear_cache_if_auto_params_changed($options) if (defined $self->{auto_params});
  -    $self->_clear_cache_if_objects_expired($options) if (defined $options->{max_age} && $self->{objects});
  +    $self->_clear_cache_if_objects_expired($options) if ((defined $options->{max_age} || defined $self->{max_age}) && $self->{objects});
   
       my $values = $self->{column_values}{$column};
       if (!$values) {
  @@ -374,7 +375,7 @@
       my $key_columns = shift;
   
       $self->_clear_cache_if_auto_params_changed($options) if (defined $self->{auto_params});
  -    $self->_clear_cache_if_objects_expired($options) if (defined $options->{max_age} && $self->{objects});
  +    $self->_clear_cache_if_objects_expired($options) if ((defined $options->{max_age} || defined $self->{max_age}) && $self->{objects});
   
       my $unique_index = $self->get_unique_index($key_name, $key_columns);
       my $object = $unique_index->{$key};
  @@ -396,7 +397,7 @@
       my $key_columns = shift;
   
       $self->_clear_cache_if_auto_params_changed($options) if (defined $self->{auto_params});
  -    $self->_clear_cache_if_objects_expired($options) if (defined $options->{max_age} && $self->{objects});
  +    $self->_clear_cache_if_objects_expired($options) if ((defined $options->{max_age} || defined $self->{max_age}) && $self->{objects});
   
       my ($objects);
       if ($key) {