Changeset 16580 for gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

Timestamp:

2008-07-29T13:29:21+12:00 (16 years ago)

Author:

ak19

Message:

Shared subroutine tmp_area_convert_file now ensures that the tailname of the file is utf8 by calling superclass BasePlugin's filepath_to_utf8 on it.

File:

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

gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

@@ -278 +278 @@
     # convert to utf-8 otherwise we have problems with the doc.xml file
     # later on
-    &unicode::ensure_utf8(\$tailname);
+    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);
 
     $suffix = lc($suffix);
@@ -375 +376 @@
     my $conv_filename = "";
     $conv_filename = $self->tmp_area_convert_file($output_ext, $filename_full_path);
-    
+        
     if ("$conv_filename" eq "") {return -1;} # had an error, will be passed down pipeline 
     if (! -e "$conv_filename") {return -1;}