--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/25 01:24:31	143
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/26 16:21:51	157
@@ -11,6 +11,7 @@
 use WebPAC::Output::TT;
 use WebPAC::Search::Estraier 0.02;
 use File::Slurp;
+use Time::HiRes;
 
 =head1 NAME
 
@@ -98,6 +99,12 @@
 		"'"
 	);
 
+	# save config parametars in object
+	foreach my $f (qw/hits_on_page/) {
+		$self->{$f} = $c->config->{hyperestraier}->{$f};
+		$log->debug("self->{$f} = " . $self->{$f});
+	}
+
 	return $self;
 
 }
@@ -124,27 +131,64 @@
 
 =head2 search
 
-  my $m->search( 'query phrase', 'result_template.tt', \@add_attr );
+  my $m->search(
+  	phrase => 'query phrase',
+	add_attr => \@add_attr
+	get_attr => [ '@uri' ],
+	max => 42,
+	template => 'result_template.tt',
+  );
+
+All fields are standard C<WebPAC::Search::Estraier> parametars except
+C<template> which will (if specified) return results in HTML using
+selected template.
 
 =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 $template_filename = $template || $self->{template};
+	my $query = $args->{phrase} || $log->warn("no query phrase") && return;
 
-	my @results = $self->{est}->search(
-		phrase => $query,
-		get_attr => [ '@uri' ],
-		max => $self->{est}->{hits_on_page} || 30,
-		add_attr => $add_attr,
-	);
+	$log->debug("search model query: '$query'");
+	if ($args->{add_attr}) {
+		$log->debug(" + add_attr: " .
+			join("','", @{ $args->{add_attr} })
+		);
+	}
+
+	my $template_filename = $args->{template} || $self->{template};
+
+	$args->{max} ||= $self->{'hits_on_page'};
+	if (! $args->{max}) {
+		$args->{max} = 10;
+		$log->warn("max not set when calling model. Using default of 10");
+	}
+
+	my $times;	# store some times for benchmarking
+
+	my $t = time();
+
+	my @results = $self->{est}->search( %{ $args } );
 
-        $log->debug("loading " . ($#results + 1) . " results");
+	$times->{est} += time() - $t;
+
+	my $hits = $#results + 1;
+
+        $log->debug( sprintf("search took %.2fs and returned $hits hits.", $times->{est}) );
+
+	# just return results?
+	return @results unless ($args->{'template'});
+
+	#
+	# construct HTML results
+	#
 
 	my @html_results;
 
@@ -154,23 +198,40 @@
 
 		#$log->debug("load_ds( $mfn )");
 
+		$t = time();
+
 		my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
-	
+
+		$times->{db} += time() - $t;
+
 		#$log->debug( "ds = " . Dumper( \@html_results ) );
 
+		$t = time();
+
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
 		);
 
+		$times->{out} += time() - $t;
+
+		$t = time();
+
 		$html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
 
+		$times->{iconv} += time() - $t;
+
 		push @html_results, $html;
 
 	}
 
 	#$log->debug( '@html_results = ' . Dumper( \@html_results ) );
 
+	$log->debug( sprintf(
+		"time spent: db = %.2f, out = %.2f, iconv = %.2f",
+		$times->{db}, $times->{out}, $times->{iconv},
+	) );
+
 	return \@html_results;
 }