--- lib/Grep/Action/Fetch.pm	2007/02/20 12:26:14	42
+++ lib/Grep/Action/Fetch.pm	2007/02/20 16:26:56	43
@@ -66,6 +66,7 @@
 	my $feed_id = $self->argument_value('feed');
 	my $publish = $self->argument_value('publish');
 	my $q = $self->argument_value('q');
+	my $user_id = Jifty->web->current_user->id;
 
 	if (! $feed_id) {
 		$self->result->message("Need feed ID");
@@ -79,44 +80,34 @@
 		return 0;
 	}
 
+	my $message;
 	my $uri = $feed->uri;
 	if ($uri =~ m/%s/) {
 		$uri = $feed->search_uri( $q );
-		Jifty->log->info("Searching ", $feed->title, " at $uri");
+		$message = 'Searching';
 	} else {
-		Jifty->log->info("Fetching ", $feed->title, " at $uri");
+		$message = 'Fetching';
 	}
+	$message .= ' ' . ( $publish ? "and publishing for $user_id" : '' ) . ' ' . $feed->title . " at $uri";
 
-	my $items = Grep::Model::ItemCollection->new();
+	Jifty->log->info( $message );
 
-	sub abort {
-		my $message = join(" ", @_);
-		if ( $publish ) {
-			Grep::Event::Result->new({
-				q => $q, coll => $items,
-				message => $message, class => 'error',
-			})->publish;
-			return;
-		} else {
-			$self->result->error( $message );
-			return;
-		}
-	}
+	my $items = Grep::Model::ItemCollection->new();
 
 	my $ua = LWP::UserAgent->new;
 	$ua->default_header( 'Cookie' => $feed->cookie );
 	my $r = $ua->get( $uri );
-	return abort(
+	return $self->abort(
 		$feed->title . " returned " . $r->status_line . " for $uri\n"
 	) unless ( $r->is_success );
 
 	my $content = $r->content;
 
-	return abort( "No content returned from $uri" ) unless length( $content ) > 1;
+	return $self->abort( "No content returned from $uri" ) unless length( $content ) > 1;
 
 
 	my $xml_feed = XML::Feed->parse( \$content )
-		or return abort( $feed->title, " returned ", XML::Feed->errstr, " for $uri" );
+		or return $self->abort( $feed->title, " returned ", XML::Feed->errstr, " for $uri" );
 
 	warn "getting entries from ", $xml_feed->title, "\n";
 
@@ -156,20 +147,51 @@
 				q => $q, coll => $items,
 				item_fragment => $self->argument_value('item_fragment'),
 				message => $message, class => 'message',
+				user_id => $user_id,
 			})->publish;
-			Jifty->log->debug( "$count items published for '$q'" );
+			Jifty->log->debug( "$count published for user $user_id for '$q'" );
 		} else {
 			$self->result->content( items => $items );
-			Jifty->log->debug( "$count items for '$q' found" );
+			Jifty->log->debug( "$count found for user $user_id for '$q'" );
 		}
 		$self->result->content( count => $items->count );
 
 	} else {
-		return abort( "No results for '$q' in " . $feed->title );
+		return $self->abort( "No results for '$q' in " . $feed->title );
 	}
 
 	return $items;
 }
 
+=head2 abort
+
+Abort action with error message which support publish or normal messages
+
+=cut
+
+sub abort {
+	my $self = shift;
+
+	my $message = join(" ", @_);
+
+	my $publish = $self->argument_value('publish');
+	my $q = $self->argument_value('q');
+	my $user_id = Jifty->web->current_user->id;
+
+	Jifty->log->debug("ABORT: $message", $publish ? " for $user_id" : '');
+
+	if ( $publish ) {
+		Grep::Event::Result->new({
+			q => $q, coll => Grep::Model::ItemCollection->new(),
+			message => $message, class => 'error',
+			user_id => $user_id,
+		})->publish;
+		return;
+	} else {
+		$self->result->error( $message );
+		return;
+	}
+}
+
 1;