--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/22 14:45:17	100
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/23 21:52:20	116
@@ -5,11 +5,11 @@
 use lib '/data/webpac2/lib';
 use base qw/
 	Catalyst::Model
-	WebPAC::Search::Estraier
 /;
 use Data::Dumper;
 use WebPAC::DB;
 use WebPAC::Output::TT;
+use WebPAC::Search::Estraier 0.02;
 
 =head1 NAME
 
@@ -78,6 +78,7 @@
 		filters => { foo => sub { shift } },
 	);
 
+	# default template from config.yaml
 	$self->{template} ||= $c->config->{webpac}->{template};
 
 	$self->{iconv} = new Text::Iconv(
@@ -97,17 +98,17 @@
 }
 
 sub search {
-	my ( $self, $query ) = @_;
+	my ( $self, $query, $template ) = @_;
 
 	my $log = $self->{log};
 
 	$log->debug("search model query: -->$query<--");
 
-	my $template_filename = $self->{template};
+	my $template_filename = $template || $self->{template};
 
 	my @results = $self->{est}->search(
-		query => $query,
-		attr => [ '@uri' ],
+		phrase => $query,
+		get_attr => [ '@uri' ],
 		max => 100,
 	);
 
@@ -119,10 +120,12 @@
 
 		my $mfn = $1 if ( $results[$i]->{'@uri'} =~ m#/(\d+)$#);
 
-		# $log->debug("load_ds( $mfn )");
+		#$log->debug("load_ds( $mfn )");
 
-		my $ds = $self->{db}->load_ds( $mfn ) || next;
+		my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
 	
+		#$log->debug( "ds = " . Dumper( \@html_results ) );
+
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
@@ -134,6 +137,8 @@
 
 	}
 
+	#$log->debug( '@html_results = ' . Dumper( \@html_results ) );
+
 	return \@html_results;
 }