--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/25 18:52:39	149
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/25 19:19:55	150
@@ -124,27 +124,39 @@
 
 =head2 search
 
-  my $m->search( 'query phrase', 'result_template.tt', \@add_attr );
+  my $m->search(
+  	phrase => 'query phrase',
+	template => 'result_template.tt',
+	add_attr => \@add_attr
+  );
 
 =cut
 
 sub search {
-	my ( $self, $query, $template, $add_attr ) = @_;
+	my $self = shift;
+
+	my $args = {@_};
 
 	my $log = $self->{log};
 
-	$log->debug("search model query: '$query', add_attr: '" . join("','", @{$add_attr}) . "'");
+	$log->debug("args: " . Dumper( $args ));
+
+	my $query = $args->{phrase} || $log->warn("no query phrase") && return;
 
-	my $template_filename = $template || $self->{template};
+	$log->debug("search model query: '$query', add_attr: '" . join("','", @{$args->{add_attr}}) . "'");
+
+	my $template_filename = $args->{template} || $self->{template};
 
 	my @results = $self->{est}->search(
 		phrase => $query,
 		get_attr => [ '@uri' ],
-		max => $self->{est}->{hits_on_page} || 30,
-		add_attr => $add_attr,
+		max => ( $self->{est}->{hits_on_page} || 30 ),
+		add_attr => $args->{add_attr},
 	);
 
-        $log->debug("loading " . ($#results + 1) . " results");
+	my $hits = $#results + 1;
+
+        $log->debug("processing $hits results");
 
 	my @html_results;