Changeset 15841 for gsdl/trunk/perllib/plugins/HTMLPlug.pm

Timestamp:

2008-06-03T16:02:04+12:00 (16 years ago)

Author:

ak19

Message:

Filename metadata is turned into utf8 and then added to the document using add_utf8_metadata as opposed to add_metadata which assumed the filename was in ASCII and converted it. The old version used to cause relative links to be perceived as external links when the links referred to html pages with foreign-language characters.

File:

• gsdl/trunk/perllib/plugins/HTMLPlug.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/HTMLPlug.pm

@@ -669 +669 @@
     # URL metadata (even invalid ones) are used to support internal
     # links, so even if 'file_is_url' is off, still need to store info
-
+    
+    $file = &BasPlug::filename_to_metadata($self, $file); # ensures filename is in UTF8 character encoding
     my $web_url = "http://$file";
-    $doc_obj->add_metadata($cursection, "URL", $web_url);
+    $doc_obj->add_utf8_metadata($cursection, "URL", $web_url); # will eventually ensure it is utf8 anyway
 
     if ($self->{'file_is_url'}) {
@@ -1073 +1074 @@
 
     my ($before_hash, $hash_part) = $link =~ /^([^\#]*)(\#?.*)$/;
-    
+
     $hash_part = "" if !defined $hash_part;
     if (!defined $before_hash || $before_hash !~ /[\w\.\/]/) {