--- trunk/WebPac.pm	2003/09/03 23:07:21	124
+++ trunk/WebPac.pm	2003/11/16 16:14:37	147
@@ -12,7 +12,7 @@
 use Text::Unaccent;
 
 use lib '..';
-use index_DBI;
+use index_DBI_cache;
 use back2html;
 
 
@@ -27,6 +27,7 @@
 my $MAX_HITS = $cfg_global->val('webpac', 'max_hits') || 0;
 my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
 my $MIN_WILDCARD =$cfg_global->val('webpac', 'min_wildcard') || 1;
+my $TEMPLATE =$cfg_global->val('webpac', 'template');
 
 
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
@@ -49,6 +50,19 @@
 	$self->header_props(-charset=>$CHARSET);
 }
 
+sub in_template {
+	my $html = shift || "This page is left unintentionally blank";
+	return $html if (! defined($TEMPLATE));
+	if (open(T, $TEMPLATE)) {
+		my $template_html = join("\n",<T>);
+		close(T);
+		$template_html =~ s/##webpac##/$html/gsi;
+		return $template_html;
+	} else {
+		return "Can't read template '$TEMPLATE'";
+	}
+}
+
 sub show_search_form {
 	my $self = shift;
 
@@ -60,8 +74,8 @@
 
 	my $fif = new HTML::FillInForm;
 
-	return $fif->fill(scalarref => \$html, fobject => $q,
-		target => 'search');
+	return in_template($fif->fill(scalarref => \$html, fobject => $q,
+		target => 'search'));
 }
  
 sub show_results_list {
@@ -79,6 +93,7 @@
 	my $full = $q->param('full');
 
 	my @persist_vars = ( 'rm' ); 
+	my @url_params = ( 'rm=results', 'show_full=1', 'last_PAGER_offset='.$q->param('PAGER_offset') || 0 );
 
 	for(my $i = 1; $i <=30; $i++) {
 
@@ -90,6 +105,9 @@
 		push @persist_vars, "f$i";
 		push @persist_vars, "v$i";
 
+		push @url_params,"f$i=".$q->url_param("f$i");
+		push @url_params,"v$i=".$q->url_param("v$i");
+
 		# re-write query from +/- to and/and not
 		my @param_vals = $q->param("v$i");
 		my @swish_q;
@@ -125,7 +143,7 @@
 		push @s_arr, $q->param("f$i")."_swish=(".join(" or ",@swish_q).")";
 	}
 
-	my $tmpl = $self->load_tmpl('results.html');
+	my $tmpl = $self->load_tmpl('results.html', global_vars => 1);
 
 	sub esc_html {
 		my $html = shift;
@@ -174,6 +192,8 @@
 	$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
 	$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
 
+	$tmpl->param('url_params',"?".join("&",@url_params));
+
 	# create a Pager object
 	my $pager = HTML::Pager->new(
 		# required parameters
@@ -208,7 +228,7 @@
 
 	my $html = $pager->output;
 
-	return $html;
+	return in_template($html);
 }
  
 sub show_index {
@@ -229,7 +249,7 @@
 		$cfg_global->val('global', 'dbi_passwd') || ''
 	);
 
-	my $total = $index->check($field);
+	my $total = $index->count($field,$limit);
 	if (! $total) {
 		my $tmpl = $self->load_tmpl('no_index.html');
 		$tmpl->param('field',$field);
@@ -252,7 +272,7 @@
 		get_data_callback => sub {
 			my ($offset, $rows) = @_;
 
-			my @result = $index->fetch($field,'item',$limit, $offset, $rows);
+			my @result = $index->fetch($field,$limit, $offset, $rows);
 			return \@result;
 		},
 		rows => $total,
@@ -266,7 +286,7 @@
 		template => $tmpl,
 	);
 
-	return $pager->output;
+	return in_template($pager->output);
 }
 
 1;