--- Webpacus2/lib/Webpacus/Action/Search.pm	2007/10/31 19:05:54	945
+++ Webpacus2/lib/Webpacus/Action/Search.pm	2007/11/01 00:17:53	954
@@ -72,7 +72,7 @@
 		_('Found') . " $total_hits " .
 		_('results for') . " '$query'";
 	
-	$message .= " " . _('on field') . ' ' . $search->name if $search->name;
+	$message .= " " . _('on field') . ' ' . $search->name if $search;
 
 	$self->result->content(
 		results => Webpacus::Search::Results->new({
@@ -144,7 +144,26 @@
 
 	warn "## next row = ", dump( $row ) if $debug;
 
-	return $row;
+	return sub {
+		my $name = shift || die "no name?";
+		if ( defined $row->{$name} ) {
+			# XXX disabled, Template::Declare always want scalars :-(
+			if ( 0 && wantarray ) {
+				if ( ref($row->{$name}) eq 'ARRAY' ) {
+					return $row->{$name};
+				} else {
+					return [ $row->{$name} ];
+				}
+			} else {
+				if ( ref($row->{$name}) eq 'ARRAY' ) {
+					return join(' ', @{ $row->{$name} });
+				} else {
+					return $row->{$name};
+				}
+			}
+		}
+		return;
+	}
 }
 
 1;