--- branches/tehnika/WebPac.pm	2005/01/19 22:40:11	640
+++ branches/tehnika/WebPac.pm	2005/01/27 21:17:47	652
@@ -12,7 +12,7 @@
 use Data::Pageset;
 
 use lib '..';
-use index_DBI_cache;
+use index_DBI_filter;
 use back2html;
 
 
@@ -438,6 +438,8 @@
 	my $field = $q->param("f$i");
 	my $limit = $q->param("v$i");
 
+	my $filter = $q->param("filter");
+
 	my $html;
 
 	my $index = new index_DBI(
@@ -447,9 +449,9 @@
 		$cfg_global->val('global', 'dbi_passwd') || ''
 	);
 
-	my $total = $index->count($field,$limit);
+	my $total = $index->count($field,$limit,$filter);
 
-	if (! $total) {
+	if (! defined($total)) {
 		my $tmpl = $self->load_tmpl(url_ex($q,'no_index.html'));
 		$tmpl->param('field',$field);
 		$html = $tmpl->output;
@@ -482,7 +484,7 @@
 	make_pager($q, $tmpl, $pager);
 	make_pager_vars($q, $tmpl, @persist_vars);
 
-	my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page);
+	my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page, $filter);
 	$tmpl->param('PAGER_DATA_LIST', \@pager_data_list);
 
 	return in_template($q,$tmpl->output);