Changeset 28381

Timestamp:

2013-10-10T14:39:22+13:00 (11 years ago)

Author:

ak19

Message:

Bugfix. When dealing with filenames with special characters that are converted to URL encoding, on Windows ConvertBinaryFile wasn't looking for the new filename but the original one. It needs to be looking for the new filename. Problem noticed with a ppt file sent in to the mailing list.

File:

• main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

@@ -258 +258 @@
     my $tmp_filename = &FileUtils::filenameConcatenate($tmp_dirname, "$utf8_tailname$lc_suffix");
     
-    # If gsdl is remote, we're given relative path to input file, of the form import/tailname.suffix
+    # If gsdl is remote, we're given relative path to input file, of the form import/utf8_tailname.suffix
     # But we can't softlink to relative paths. Therefore, we need to ensure that
     # the input_filename is the absolute path, see http://perldoc.perl.org/File/Spec.html
@@ -327 +327 @@
     # running under windows
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        $output_filename = $tmp_dirname . "\\$tailname\\" . $tailname . ".$output_type";
+        $output_filename = $tmp_dirname . "\\$utf8_tailname\\" . $utf8_tailname . ".$output_type";
     } else {
-        $output_filename = $tmp_dirname . "\/$tailname\/" . $tailname . ".$output_type";
+        $output_filename = $tmp_dirname . "\/$utf8_tailname\/" . $utf8_tailname . ".$output_type";
     }
     } else {