--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/25 01:24:31	143
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/12/25 23:31:59	322
@@ -7,10 +7,11 @@
 	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.06;
+use WebPAC::Search::Estraier 0.05;
 use File::Slurp;
+use Time::HiRes;
 
 =head1 NAME
 
@@ -33,10 +34,13 @@
 
  # 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
+  hits_for_pager: 1000
 
  webpac:
   db_path: '/data/webpac2/db'
@@ -61,21 +65,33 @@
 	my $est_cfg = $c->config->{hyperestraier};
 	$est_cfg->{'log'} = $log;
 
-	$est_cfg->{encoding} = $est_cfg->{catalyst_encoding};
+	$est_cfg->{encoding} = $est_cfg->{catalyst_encoding} || $c->config->{catalyst_encoding} or $c->log->fatal("can't find catalyst_encoding");
 
 	$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(
@@ -98,87 +114,195 @@
 		"'"
 	);
 
+	$self->{databases} = $c->config->{databases} || $log->error("can't find databases in config");
+
 	return $self;
 
 }
 
-=head2 iconv_on_save
 
-  my $out = $m->iconv_on_save( $content );
+=head2 search
 
-Convert data saved to disk in Webpac encoding.
+  my $m->search(
+  	phrase => 'query phrase',
+	add_attr => \@add_attr
+	get_attr => [ '@uri' ],
+	max => 42,
+	template => 'result_template.tt',
+	depth => 1,
+  );
+
+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 iconv_on_save {
+sub search {
 	my $self = shift;
 
-	$self->{iconv_save} ||= new Text::Iconv(
-		$self->config->{webpac}->{out_encoding},
-		$self->config->{webpac}->{webpac_encoding},
-	);
+	my $args = {@_};
 
-	$self->{iconv_save}->convert( @_ );
-}
+	my $log = $self->{log};
 
+	$log->debug("args: " . Dumper( $args ));
 
-=head2 search
+	my $query = $args->{phrase} || $log->warn("no query phrase") && return;
 
-  my $m->search( 'query phrase', 'result_template.tt', \@add_attr );
+	$log->debug("search model query: '$query'");
+	if ($args->{add_attr}) {
+		$log->debug(" + add_attr: " .
+			join("','", @{ $args->{add_attr} })
+		);
+	}
 
-=cut
+	my $template_filename = $args->{template} || $self->{template};
 
-sub search {
-	my ( $self, $query, $template, $add_attr ) = @_;
+	$args->{max} ||= $self->{'hits_for_pager'};
+	if (! $args->{max}) {
+		$args->{max} = 100;
+		$log->warn("max not set when calling model. Using default of $args->{max}");
+	}
 
-	my $log = $self->{log};
+	my $times;	# store some times for benchmarking
 
-	$log->debug("search model query: '$query', add_attr: '" . join("','", @{$add_attr}) . "'");
+	my $t = time();
 
-	my $template_filename = $template || $self->{template};
+	# 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(
-		phrase => $query,
-		get_attr => [ '@uri' ],
-		max => $self->{est}->{hits_on_page} || 30,
-		add_attr => $add_attr,
-	);
+	my @results = $self->{est}->search( %{ $args } );
+
+	$times->{est} += time() - $t;
+
+	my $hits = $#results + 1;
+
+        $log->debug( sprintf("search took %.2fs and returned $hits hits.", $times->{est}) );
 
-        $log->debug("loading " . ($#results + 1) . " results");
+	# just return results?
+	return @results unless ($args->{'template'});
+
+	#
+	# construct HTML results
+	#
 
 	my @html_results;
 
 	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 database/prefix/id from " .  $results[$i]->{'@uri'});
+			next;
+		}
+
+		#$log->debug("load_ds( id => $id, prefix => '$prefix' )");
+
+		$t = time();
+
+		my $ds = $self->{db}->load_ds( database => $database, prefix => $prefix, id => $id );
+		if (! $ds) {
+			$log->error("can't load_ds( ${database}/${prefix}/${id} )");
+			next;
+		}
 
-		#$log->debug("load_ds( $mfn )");
+		$times->{db} += time() - $t;
 
-		my $ds = $self->{db}->load_ds( $mfn ) || $log->error("can't load_ds( $mfn )") && next;
-	
 		#$log->debug( "ds = " . Dumper( \@html_results ) );
 
+		$t = time();
+
 		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
+			record_uri => "${database}/${prefix}/${id}",
+			config => $self->{databases}->{$database},
 		);
 
+		$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;
 }
 
+=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},
+		config => $self->{databases}->{$database},
+	);
+
+	$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
@@ -189,8 +313,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)));
@@ -198,8 +320,21 @@
 	$content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;
 	$content =~ s/^[\n\r]+//s;
 	$content =~ s/[\n\r]+$/\n/s;
+	$content =~ s/\n\r/\n/gs;
+
+	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', $content) || die "can't save ${path}.new $!";
+	write_file($path . '.new', {binmode => ':raw' }, $content) || die "can't save ${path}.new $!";
 	rename $path . '.new', $path || die "can't rename to $path: $!";
 }
 
@@ -218,7 +353,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);