--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/22 14:45:12	99
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2005/11/25 00:23:33	142
@@ -5,11 +5,12 @@
 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;
 
 =head1 NAME
 
@@ -59,12 +60,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 +82,7 @@
 		filters => { foo => sub { shift } },
 	);
 
+	# default template from config.yaml
 	$self->{template} ||= $c->config->{webpac}->{template};
 
 	$self->{iconv} = new Text::Iconv(
@@ -85,10 +90,10 @@
 		$c->config->{webpac}->{out_encoding}
 	);
 
-	$log->debug("converting encoding from webpac_encoding '" ,
-		$c->config->{webpac}->{webpac_encoding},
-		"' to '",
-		$c->config->{webpac}->{out_encoding},
+	$log->debug("converting encoding from webpac_encoding '" .
+		$c->config->{webpac}->{webpac_encoding} .
+		"' to '" .
+		$c->config->{webpac}->{out_encoding} .
 		"'"
 	);
 
@@ -96,42 +101,128 @@
 
 }
 
+=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( 'query phrase', 'result_template.tt', \@add_attr );
+
+=cut
+
 sub search {
-	my ( $self, $query ) = @_;
+	my ( $self, $query, $template, $add_attr ) = @_;
 
 	my $log = $self->{log};
 
-	$log->debug("search model query: -->$query<--");
+	$log->debug("search model query: '$query', add_attr: '" . join("','", @{$add_attr}) . "'");
 
-	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,
+		add_attr => $add_attr,
 	);
 
         $log->debug("loading " . ($#results + 1) . " results");
 
+	my @html_results;
+
 	for my $i ( 0 .. $#results ) {
 
 		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 ) || $log->error("can't load_ds( $mfn )") && next;
+	
+		#$log->debug( "ds = " . Dumper( \@html_results ) );
 
-		my $ds = $self->{db}->load_ds( $mfn ) || next;
-		$results[$i]->{ html } = $self->{iconv}->convert(
-		$self->{out}->apply(
+		my $html = $self->{out}->apply(
 			template => $template_filename,
 			data => $ds,
-		) );
+		);
+
+		$html = $self->{iconv}->convert( $html ) || $log->error("can't convert: $html");
+
+		push @html_results, $html;
+
 	}
 
-	return \@results;
+	#$log->debug( '@html_results = ' . Dumper( \@html_results ) );
+
+	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