cvs commit: xml-axkit/lib AxKit.pm

[kip]

kip         2003/03/12 10:20:48

  Modified:    lib      AxKit.pm
  Log:
  Make caching work correctly for non-file-based Providers.
  
  Revision  Changes    Path
  1.42      +3 -3      xml-axkit/lib/AxKit.pm
  
  Index: AxKit.pm
  ===================================================================
  RCS file: /home/cvs/xml-axkit/lib/AxKit.pm,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- AxKit.pm  7 Feb 2003 12:20:47 -0000       1.41
  +++ AxKit.pm  12 Mar 2003 18:20:48 -0000      1.42
  @@ -388,7 +388,7 @@
       AxKit::Debug(2, "media: $media, preferred style: $preferred");
   
       # get cache object
  -    my $cache = Apache::AxKit::Cache->new($r, $r->filename() . 
($AxKit::Cfg->GzipOutput ? '.gzip' : '') . ($r->path_info() || ''), $preferred, 
$media, $r->notes('axkit_cache_extra'));
  +    my $cache = Apache::AxKit::Cache->new($r, $provider->key() . 
($AxKit::Cfg->GzipOutput ? '.gzip' : '') . ($r->path_info() || ''), $preferred, 
$media, $r->notes('axkit_cache_extra'));
   
       my $recreate = 0; # regenerate from source (not cached)
   
  @@ -401,7 +401,7 @@
               # Make sure we default the cache file, otherwise
               # we setup a potential DoS
               AxKit::Debug(3, "resetting cache with no preferred style 
($preferred ne $styles->[0]{title})");
  -            $cache = Apache::AxKit::Cache->new($r, $r->filename() . 
($AxKit::Cfg->GzipOutput ? '.gzip' : '') . $r->path_info(), '', $media, 
$r->notes('axkit_cache_extra'));
  +            $cache = Apache::AxKit::Cache->new($r, $provider->key() . 
($AxKit::Cfg->GzipOutput ? '.gzip' : '') . $r->path_info(), '', $media, 
$r->notes('axkit_cache_extra'));
           }
       }