--- lib/Grep/Action/Fetch.pm	2007/02/19 16:28:00	28
+++ lib/Grep/Action/Fetch.pm	2007/02/19 20:53:09	32
@@ -45,10 +45,16 @@
 #		available are qw/result result_short/;
 		available are qw/long short title/;
 
+	param publish =>
+		label is 'In which queue?';
+
 };
 
 =head2 take_action
 
+Returns C<Grep::Model::ItemCollection> of fatched items from Feed which will
+also be stored in local cache.
+
 =cut
 
 sub take_action {
@@ -58,6 +64,8 @@
 
 	my $feed = Grep::Model::Feed->new();
 	my $feed_id = $self->argument_value('feed');
+	my $publish = $self->argument_value('publish');
+	my $q = $self->argument_value('q');
 
 	if (! $feed_id) {
 		$self->result->message("Need feed ID");
@@ -73,28 +81,44 @@
 
 	my $uri = $feed->uri;
 	if ($uri =~ m/%s/) {
-		$uri = $feed->search_uri( $self->argument_value('q') );
+		$uri = $feed->search_uri( $q );
 		Jifty->log->info("Searching ", $feed->title, " at $uri");
 	} else {
 		Jifty->log->info("Fetching ", $feed->title, " at $uri");
 	}
 
+	my $items = Grep::Model::ItemCollection->new();
+
+	sub abort {
+		my $message = join(" ", @_);
+		if ( $publish ) {
+			Grep::Event::Result->new({
+				q => $q, coll => $items,
+				message => $message, class => 'error',
+			})->publish;
+			return 0;
+		} else {
+			$self->result->error( $message );
+			return 0;
+		}
+	}
 	my $ua = LWP::UserAgent->new;
 	$ua->default_header( 'Cookie' => $feed->cookie );
 	my $r = $ua->get( $uri );
-	die $feed->title . " returned " . $r->status_line . " for $uri\n" unless ( $r->is_success );
+	return abort(
+		$feed->title . " returned " . $r->status_line . " for $uri\n"
+	) unless ( $r->is_success );
 
 	my $content = $r->content;
 
-	die "No content returned from $uri" unless length( $content ) > 1;
+	return abort( "No content returned from $uri" ) unless length( $content ) > 1;
+
 
 	my $xml_feed = XML::Feed->parse( \$content )
-		or die $feed->title, " returned ", XML::Feed->errstr, " for $uri\n";
+		or return abort( $feed->title, " returned ", XML::Feed->errstr, " for $uri" );
 
 	warn "getting entries from ", $xml_feed->title, "\n";
 
-	my @items;
-
 	for my $entry ($xml_feed->entries) {
 		my $i = Grep::Model::Item->new();
 
@@ -106,37 +130,43 @@
 			summary => $entry->summary->body,
 			category => $entry->category,
 			author => $entry->author,
-			issued => $entry->issued ? $entry->issued->strftime("%Y-%m-%d %H:%M:%S %z") : undef,
-			modified => $entry->modified ? $entry->modified->strftime("%Y-%m-%d %H:%M:%S %z") : undef,
+			issued => $entry->issued ? $entry->issued->strftime("%Y-%m-%d %H:%M:%S") : undef,
+			modified => $entry->modified ? $entry->modified->strftime("%Y-%m-%d %H:%M:%S") : undef,
 		);
 
 		if ( $i->id ) {
-			push @items, $i;
-
-	#		Grep::Event::Result->new( $i )->publish;
+			$items->add_record( $i );
 
-			Jifty->log->debug("published ", $i->id ) ; # dump( $entry, $i ) );
+			Jifty->log->debug("added ", $i->id, " to collection");
 		} else {
-			warn "can't create item from entry ", dump( $entry ) unless ( $i->id );
+			warn "can't add entry ", dump( $entry ) unless ( $i->id );
 		}
 
 	}
 
-	if ( @items ) {
+	if ( $items ) {
 
-		$self->result->message( $self->argument_value('q') . ' => ' .
-			$xml_feed->entries . ' items: ' . join(",", map { $_->id } @items)
-		);
-
-		$self->result->content( items => \@items );
-		return 1;
+		my $message = $q . ' => ' . $xml_feed->entries . ' results in ' . $feed->title;
 
-	} else {
+		$self->result->message( $message );
 
-		$self->result->error( 'No results found' );
-		return 0;
+		if ( $publish ) {
+			Grep::Event::Result->new({
+				q => $q, coll => $items,
+				item_fragment => $self->argument_value('item_fragment'),
+				message => $message, class => 'messages',
+			})->publish;
+			Jifty->log->debug( $items->count, " for '$q' published" );
+		} else {
+			$self->result->content( items => $items );
+			Jifty->log->debug( $items->count, " for '$q' found" );
+		}
 
+	} else {
+		return abort( 'No results found' );
 	}
+
+	return $items;
 }
 
 1;