--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/26 16:21:51	157
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/14 23:11:06	248
@@ -7,9 +7,9 @@
 	Catalyst::Model
 /;
 use Data::Dumper;
-use WebPAC::DB;
-use WebPAC::Output::TT;
-use WebPAC::Search::Estraier 0.02;
+use WebPAC::Store 0.08;
+use WebPAC::Output::TT 0.04;
+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,17 +68,29 @@
 
 	$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 } );
 
-	my $db_path = $c->config->{webpac}->{db_path};
-	my $template_path = $c->config->{webpac}->{template_path};
-	$self->{template_path} = $template_path;
+	# save config parametars in object
+	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});
+	}
+	my $db_path = $self->{db_path};
+	my $template_path = $self->{template_path};
 
 	$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,
+		database => $est_cfg->{database},
 	);
 
 	$self->{out} = new WebPAC::Output::TT(
@@ -99,35 +113,11 @@
 		"'"
 	);
 
-	# 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;
 
 }
 
-=head2 iconv_on_save
-
-  my $out = $m->iconv_on_save( $content );
-
-Convert data saved to disk in Webpac encoding.
-
-=cut
-
-sub iconv_on_save {
-	my $self = shift;
-
-	$self->{iconv_save} ||= new Text::Iconv(
-		$self->config->{webpac}->{out_encoding},
-		$self->config->{webpac}->{webpac_encoding},
-	);
-
-	$self->{iconv_save}->convert( @_ );
-}
-
 
 =head2 search
 
@@ -137,6 +127,7 @@
 	get_attr => [ '@uri' ],
 	max => 42,
 	template => 'result_template.tt',
+	depth => 1,
   );
 
 All fields are standard C<WebPAC::Search::Estraier> parametars except
@@ -175,6 +166,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;
@@ -194,13 +192,23 @@
 
 	for my $i ( 0 .. $#results ) {
 
-		my $mfn = $1 if ( $results[$i]->{'@uri'} =~ m#/(\d+)$#);
+		my ($database, $prefix, $id);
+		if ( $results[$i]->{'@uri'} =~ m!/([^/]+)/([^/]+)#(\d+)$!) {
+			($database, $prefix,$id) = ($1,$2,$3);
+		} else {
+			$log->warn("can't decode prefix#id from " .  $results[$i]->{'@uri'});
+			next;
+		}
 
-		#$log->debug("load_ds( $mfn )");
+		#$log->debug("load_ds( id => $id, prefix => '$prefix' )");
 
 		$t = time();
 
-		my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
+		my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );
+		if (! $ds) {
+			$log->error("can't load_ds( ${database}/${prefix}#${id} )");
+			next;
+		}
 
 		$times->{db} += time() - $t;
 
@@ -211,6 +219,7 @@
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
+			record_uri => "${database}/${prefix}/${id}",
 		);
 
 		$times->{out} += time() - $t;
@@ -235,11 +244,60 @@
 	return \@html_results;
 }
 
+=head2 record
+
+  my $html = $m->record(
+  	mfn => 42,
+	template => 'foo.tt',
+  );
+
+This will load one record, convert it to html using C<template> and return
+it.
+
+=cut
+
+sub record {
+	my $self = shift;
+
+	my $args = {@_};
+	my $log = $self->{log};
+	$log->debug("args: " . Dumper( $args ));
+
+	foreach my $f (qw/record_uri template/) {
+		$log->fatal("need $f") unless ($args->{$f});
+	}
+
+	my ($database, $prefix, $id);
+
+	if ($args->{record_uri} =~ m#^([^/]+)/([^/]+)/([^/]+)$#) {
+		($database, $prefix, $id) = ($1,$2,$3);
+	} else {
+		$log->error("can't parse $args->{record_uri} into prefix, database and uri");
+		return;
+	}
+
+	my $ds = $self->{db}->load_ds( id => $id, prefix => $prefix, database => $database );
+	if (! $ds) {
+		$log->error("can't load_ds( $database/$prefix/$id )");
+		return;
+	}
+
+	my $html = $self->{out}->apply(
+		template => $args->{template},
+		data => $ds,
+		record_uri => $args->{record_uri},
+	);
+
+	$html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
+
+	return $html;
+}
+
 =head2 save_html
 
   $m->save_html( '/full/path/to/file', $content );
 
-It will use C<iconv_on_save> to convert content encoding back to
+It will use C<Text::Iconv> to convert content encoding back to
 Webpac codepage, recode JavaScript Unicode entities (%u1234),
 strip extra newlines at beginning and end, and save to 
 C</full/path/to/file.new> and if that succeeds, just rename
@@ -250,8 +308,6 @@
 sub save_html {
 	my ($self, $path, $content) = @_;
 
-	$content = $self->iconv_on_save( $content ) || die "no content?";
-
 	sub _conv_js {
 		my $t = shift || return;
 		return $self->{iconv}->convert(chr(hex($t)));
@@ -260,7 +316,19 @@
 	$content =~ s/^[\n\r]+//s;
 	$content =~ s/[\n\r]+$/\n/s;
 
-	write_file($path . '.new', $content) || die "can't save ${path}.new $!";
+	my ($from, $to) = (
+		$self->{out_encoding},
+		$self->{webpac_encoding},
+	);
+
+	$self->{log}->debug("using iconv to convert from $from to $to encoding");
+
+	my $iconv_on_save = new Text::Iconv($from, $to)
+		|| $self->{log}->fatal("can't create iconv for saving");
+
+	$content = $iconv_on_save->convert( $content ) || die "no content?";
+
+	write_file($path . '.new', {binmode => ':raw' }, $content) || die "can't save ${path}.new $!";
 	rename $path . '.new', $path || die "can't rename to $path: $!";
 }
 
@@ -279,7 +347,7 @@
 
 	die "no path?" unless ($path);
 
-	my $content = read_file($path) || die "can't read $path: $!";
+	my $content = read_file($path, {binmode => ':raw' }) || die "can't read $path: $!";
 	#$content = $q->escapeHTML($iconv_utf8->convert($content));
 	$content = $self->{iconv}->convert($content);