--- lib/Grep/Source.pm 2007/02/24 11:56:18 96 +++ lib/Grep/Source.pm 2007/02/24 12:32:31 100 @@ -7,7 +7,7 @@ use Carp qw/verbose/; use Module::Pluggable search_path => 'Grep::Source', sub_name => 'sources', require => 1; -use base qw(Class::Accessor); +use base qw(Class::Accessor Jifty::Object); Grep::Source->mk_accessors( qw(feed uri q new_items collection) ); use HTML::TreeBuilder; @@ -101,12 +101,12 @@ $self->uri( $uri ); - Jifty->log->info( $message ); + $self->log->info( $message ); $self->collection( Grep::Model::ItemCollection->new() ); my $class = $self->feed->source || 'Grep::Source::Feed'; - Jifty->log->debug("using $class"); + $self->log->debug("using $class"); my $parent = $self; $class->fetch( $parent ); @@ -144,7 +144,7 @@ $msg ||= ''; if ( $ok ) { - Jifty->log->debug("item ", $i->id, ": $msg"); + $self->log->debug("item ", $i->id, ": $msg"); $self->collection->add_record( $i ); # is new record? @@ -171,14 +171,14 @@ my $content = shift or die "no content?"; foreach my $s ( $self->sources ) { - Jifty->log->debug("testing source class $s"); + $self->log->debug("testing source class $s"); if ( $s->can('content_have') ) { my $regex = $s->content_have( $content ) or die "${s}->content_have didn't return anything"; die "${s}->content_have didn't return regex but ", dump( $regex ), " ref ", ref( $regex ) unless ( ref($regex) eq 'Regexp' ); if ( $content =~ $regex ) { - Jifty->log->debug("${s}->content_have succesful"); + $self->log->debug("${s}->content_have succesful"); return $s; } } @@ -311,11 +311,12 @@ sub save { my $self = shift; my ( $file, $content ) = @_; + return unless ( defined($file) && defined($content) ); if ( -w '/tmp/grep' ) { open(my $f, '>', "/tmp/grep/$file") or die "can't open $file: $!"; print $f $content or die "can't write to $file: $!"; close $f or die "can't close $file: $!"; - Jifty->log->debug("saved $file ",length($content)," bytes"); + $self->log->debug("saved $file ",length($content)," bytes"); } }