--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/22 14:45:17	100
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/26 16:21:51	157
@@ -5,11 +5,13 @@
 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;
+use File::Slurp;
+use Time::HiRes;
 
 =head1 NAME
 
@@ -35,6 +37,7 @@
   url: 'http://localhost:1978/node/webpac2'
   user: 'admin'
   passwd: 'admin'
+  hits_on_page: 100
 
  webpac:
   db_path: '/data/webpac2/db'
@@ -59,12 +62,15 @@
 	my $est_cfg = $c->config->{hyperestraier};
 	$est_cfg->{'log'} = $log;
 
+	$est_cfg->{encoding} = $est_cfg->{catalyst_encoding};
+
 	$log->debug("using config:" . Dumper($est_cfg) );
 
 	$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;
 
 	$log->debug("using db path '$db_path', template path '$template_path'");
 
@@ -78,6 +84,7 @@
 		filters => { foo => sub { shift } },
 	);
 
+	# default template from config.yaml
 	$self->{template} ||= $c->config->{webpac}->{template};
 
 	$self->{iconv} = new Text::Iconv(
@@ -92,26 +99,96 @@
 		"'"
 	);
 
+	# 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
+
+  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 ) = @_;
+	my $self = shift;
+
+	my $args = {@_};
 
 	my $log = $self->{log};
 
-	$log->debug("search model query: -->$query<--");
+	$log->debug("args: " . Dumper( $args ));
 
-	my $template_filename = $self->{template};
+	my $query = $args->{phrase} || $log->warn("no query phrase") && return;
 
-	my @results = $self->{est}->search(
-		query => $query,
-		attr => [ '@uri' ],
-		max => 100,
-	);
+	$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 } );
+
+	$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;
 
@@ -119,26 +196,95 @@
 
 		my $mfn = $1 if ( $results[$i]->{'@uri'} =~ m#/(\d+)$#);
 
-		# $log->debug("load_ds( $mfn )");
+		#$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 $ds = $self->{db}->load_ds( $mfn ) || next;
-	
 		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;
 }
 
+=head2 save_html
+
+  $m->save_html( '/full/path/to/file', $content );
+
+It will use C<iconv_on_save> 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
+it over original file which should be atomic on filesystem level.
+
+=cut
+
+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)));
+	}
+	$content =~ s/%u([a-fA-F0-9]{4})/_conv_js($1)/gex;
+	$content =~ s/^[\n\r]+//s;
+	$content =~ s/[\n\r]+$/\n/s;
+
+	write_file($path . '.new', $content) || die "can't save ${path}.new $!";
+	rename $path . '.new', $path || die "can't rename to $path: $!";
+}
+
+=head2 load_html
+
+  my $html = $m->load_html('/full/path/to/file');
 
-	
+This will convert file from Webpac encoding to Catalyst and
+convert that data to escaped HTML (for sending into
+C<< <textarea/> >> tags in html.
+
+=cut
+
+sub load_html {
+	my ($self, $path) = @_;
+
+	die "no path?" unless ($path);
+
+	my $content = read_file($path) || die "can't read $path: $!";
+	#$content = $q->escapeHTML($iconv_utf8->convert($content));
+	$content = $self->{iconv}->convert($content);
+
+	return $content;
+}
 
 =head1 AUTHOR