cvs commit: xml-axkit/lib/Apache/AxKit Provider.pm

[matts]

matts       2003/07/16 01:57:21

  Modified:    lib      AxKit.pm
               lib/Apache/AxKit Provider.pm
  Log:
  When checking provider dependencies, make sure we load the right provider
  type
  PR: https://rt.cpan.org/Ticket/Display.html?id=2277
  
  Revision  Changes    Path
  1.46      +7 -3      xml-axkit/lib/AxKit.pm
  
  Index: AxKit.pm
  ===================================================================
  RCS file: /home/cvs/xml-axkit/lib/AxKit.pm,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- AxKit.pm  16 Jul 2003 08:52:00 -0000      1.45
  +++ AxKit.pm  16 Jul 2003 08:57:15 -0000      1.46
  @@ -870,8 +870,12 @@
           if ($depends_contents) {
               DEPENDENCY:
               for my $dependency (split(/:/, $depends_contents)) {
  -                AxKit::Debug(3, "Checking dependency: $dependency for 
resource ", $provider->key());
  -                my $dep = Apache::AxKit::Provider->new($r, key => 
$dependency);
  +                $dependency =~ s|^\{(\w+)\}||;
  +                my $dep_type = $1;
  +                AxKit::Debug(3, "Checking dependency: $dependency of type 
$dep_type for resource ", $provider->key());
  +                my $dep = ($dep_type eq "style") ?
  +                    Apache::AxKit::Provider->new_style_provider($r, key => 
$dependency) :
  +                    Apache::AxKit::Provider->new($r, key => $dependency);
                   if ( $dep->has_changed( $cache->mtime() ) ) {
                       AxKit::Debug(4, "dependency: $dependency newer");
                       return 1;
  
  
  
  1.14      +3 -3      xml-axkit/lib/Apache/AxKit/Provider.pm
  
  Index: Provider.pm
  ===================================================================
  RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Provider.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Provider.pm       18 Feb 2003 22:37:22 -0000      1.13
  +++ Provider.pm       16 Jul 2003 08:57:20 -0000      1.14
  @@ -20,7 +20,7 @@
   
       $self->init(@_);
   
  -    AxKit::add_depends($self->key());
  +    AxKit::add_depends("{style}".$self->key());
   
       return $self;
   }
  @@ -37,7 +37,7 @@
   
       $self->init(@_);
   
  -    AxKit::add_depends($self->key());
  +    AxKit::add_depends("{content}".$self->key());
   
       return $self;
   }