--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/30 23:21:30	200
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/05 19:15:01	222
@@ -7,9 +7,9 @@
 	Catalyst::Model
 /;
 use Data::Dumper;
-use WebPAC::DB;
+use WebPAC::Store 0.03;
 use WebPAC::Output::TT 0.02;
-use WebPAC::Search::Estraier 0.02;
+use WebPAC::Search::Estraier 0.05;
 use File::Slurp;
 use Time::HiRes;
 
@@ -34,7 +34,9 @@
 
  # configuration for hyper estraier full text search engine
  hyperestraier:
-  url: 'http://localhost:1978/node/webpac2'
+  masterurl: 'http://localhost:1978/node/webpac2'
+  defaultnode: 'webpac2'
+  defaultdepth: 1
   user: 'admin'
   passwd: 'admin'
   hits_on_page: 100
@@ -66,10 +68,16 @@
 
 	$log->debug("using config:" . Dumper($est_cfg) );
 
+	if (! $est_cfg->{database}) {
+		my $defaultnode = $est_cfg->{defaultnode} || $log->logdie("can't find defaultnode in estraier configuration");
+		$log->info("using default node $defaultnode");
+		$est_cfg->{database} = $defaultnode;
+	}
+
 	$self->{est} = new WebPAC::Search::Estraier( %{ $est_cfg } );
 
 	# save config parametars in object
-	foreach my $f (qw/db_path template_path hits_on_page webpac_encoding out_encoding/) {
+	foreach my $f (qw/db_path template_path hits_on_page webpac_encoding out_encoding defaultdepth/) {
 		$self->{$f} = $c->config->{hyperestraier}->{$f} ||
 			$c->config->{webpac}->{$f};
 		$log->debug("self->{$f} = " . $self->{$f});
@@ -79,7 +87,7 @@
 
 	$log->debug("using db path '$db_path', template path '$template_path'");
 
-	$self->{db} = new WebPAC::DB(
+	$self->{db} = new WebPAC::Store(
 		path => $db_path,
 		read_only => 1,
 	);
@@ -118,6 +126,7 @@
 	get_attr => [ '@uri' ],
 	max => 42,
 	template => 'result_template.tt',
+	depth => 1,
   );
 
 All fields are standard C<WebPAC::Search::Estraier> parametars except
@@ -156,6 +165,13 @@
 
 	my $t = time();
 
+	# transfer depth of search
+	if (! $args->{depth}) {
+		my $default = $self->{defaultdepth} || $log->logdie("can't find defaultdepth in estraier configuration");
+		$args->{depth} = $default;
+		$log->warn("using default search depth $default");
+	}
+
 	my @results = $self->{est}->search( %{ $args } );
 
 	$times->{est} += time() - $t;