search: Fix encoding bug in calculation of maximum term size.

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 8138cd67f86d159c3a611a8e7a6a4a90765c3bbc..42d2e0d3009d9e190fa78790f581c536355a8d70 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -192,7 +192,8 @@ sub pageterm ($) {
 
        # 240 is the number used by omindex to decide when to hash an
        # overlong term. This does not use a compatible hash method though.
 
        # 240 is the number used by omindex to decide when to hash an
        # overlong term. This does not use a compatible hash method though.

-       if (length $page > 240) {
+       eval q{use Encode};
+       if (length encode_utf8($page) > 240) {

                eval q{use Digest::SHA};
                if ($@) {
                        debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@;
                eval q{use Digest::SHA};
                if ($@) {
                        debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@;

diff --git a/debian/changelog b/debian/changelog
index cd0b3a11414d50c908ccb8c7c8d68693cab7d4d5..5295030d56b5c690ce3ee3248ad8968d19a8c902 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * Update to jquery 1.6.2, and jquery-ui 1.8.14.
   * Use lockf rather than flock when taking the cgilock, for better
     portability.
   * Update to jquery 1.6.2, and jquery-ui 1.8.14.
   * Use lockf rather than flock when taking the cgilock, for better
     portability.

+  * search: Fix encoding bug in calculation of maximum term size.

 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400