aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Georg Gleditsch <argggh@lxr.linpro.no>2010-08-07 00:09:10 +0200
committerArne Georg Gleditsch <argggh@lxr.linpro.no>2010-08-07 00:09:10 +0200
commitcd756357a261aec69995b42d1e8b8b47903e6706 (patch)
tree1b7c7dd2c3d848e077f929b51572ec78a103e124
parentce8b8143639b5f4f40f789852d6908984f1d866d (diff)
UTF-8/mod_perl fixes.
-rw-r--r--lib/LXRng/Context.pm6
-rw-r--r--lib/LXRng/Search/Xapian.pm5
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/LXRng/Context.pm b/lib/LXRng/Context.pm
index fe1a0fe..959151b 100644
--- a/lib/LXRng/Context.pm
+++ b/lib/LXRng/Context.pm
@@ -47,7 +47,11 @@ sub new {
$$self{'req_base'} = $host.$ENV{'SCRIPT_NAME'};
foreach my $p ($args{'query'}->param) {
- $$self{'params'}{$p} = [$args{'query'}->param($p)];
+ my @val = $args{'query'}->param($p);
+ for (@val) {
+ utf8::upgrade($_);
+ }
+ $$self{'params'}{$p} = [@val];
}
my @prefs = $args{'query'}->cookie('lxr_prefs');
if (@prefs) {
diff --git a/lib/LXRng/Search/Xapian.pm b/lib/LXRng/Search/Xapian.pm
index 100d303..52f1733 100644
--- a/lib/LXRng/Search/Xapian.pm
+++ b/lib/LXRng/Search/Xapian.pm
@@ -110,9 +110,8 @@ sub add_release {
sub indexed_term {
my ($term) = @_;
- use bytes;
- return 0 if length($term) <= 2;
- return 0 if length($term) > 128;
+ return 0 if bytes::length($term) <= 2;
+ return 0 if bytes::length($term) > 128;
return 0 if $STOPWORD{$term};
return 1;