Changeset 16888

Timestamp:

2008-08-19T12:48:58+12:00 (16 years ago)

Author:

ak19

Message:

URL encodes the name of the file(s) generated upon conversion to html, incl assoc image files. This is in order for ReplaceSrcDocWithHtml to be able to allow users to edit an html file with images since an html file with a utf8 filename referring to imgs with utf8 filenames don't work properly when viewed statically on Firefox or IE a Windows machine

File:

• gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

@@ -276 +276 @@
     #$tailname =~ s/\-+//g;
 
-    # convert to utf-8 otherwise we have problems with the doc.xml file
-    # later on
-    print STDERR "**** filename $tailname$suffix is already UTF8\n" if &unicode::check_is_utf8($tailname);
+    # convert to utf-8 otherwise we have problems with the doc.xml file later on
+#    print STDERR "**** filename $tailname$suffix is already UTF8\n" if &unicode::check_is_utf8($tailname);
     $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
+
+    # URLEncode this since htmls with images where the html filename is utf8 don't seem
+    # to work on Windows (IE or Firefox), as browsers are looking for filesystem-encoded
+    # files on the filesystem.
+    $tailname = &unicode::url_encode($tailname);
 
     $suffix = lc($suffix);