--- branches/lezbib/WebPac.pm 2005/01/19 22:40:11 640
+++ branches/lezbib/WebPac.pm 2005/03/13 02:03:30 697
@@ -10,9 +10,10 @@
use Config::IniFiles;
use Text::Unaccent;
use Data::Pageset;
+use POSIX qw(locale_h);
use lib '..';
-use index_DBI_cache;
+use index_DBI_filter;
use back2html;
@@ -32,11 +33,15 @@
my $BASE_PATH =$cfg_global->val('webpac', 'base_path');
# for pager
my $pages_per_set = $cfg_global->val('webpac', 'pages_per_set') || 10;
+my $locale = $cfg_global->val('locale') || 'hr_HR';
Text::Iconv->raise_error(0); # Conversion errors raise exceptions
my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
+setlocale(LC_CTYPE, $locale);
+setlocale(LC_COLLATE, $locale);
+
if ($UNAC_FILTER) {
require $UNAC_FILTER;
} else {
@@ -148,7 +153,7 @@
foreach my $p (@{$pager->pages_in_set()}) {
- next if ($p < 0);
+ next if ($p <= 0);
if($p == $pager->current_page()) {
$pager_jump .= "$p ";
} else {
@@ -182,14 +187,18 @@
my $tmpl = shift @_;
my @persist_vars = @_;
my $hidden_vars = '';
+ my $hidden_search = '';
foreach my $v (@persist_vars) {
foreach my $val ($q->param($v)) {
next if (! $val || $val eq '');
+ $val =~ s/"/"/g;
$hidden_vars .= ''."\n";
+ $hidden_search .= ''."\n" if ($v ne "rm");
}
}
$tmpl->param('PAGER_HIDDEN', $hidden_vars);
+ $tmpl->param('SEARCH_HIDDEN', $hidden_search);
$tmpl->param('PAGER_JAVASCRIPT', qq#