Changeset 16580

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.

Location:

gsdl/trunk/perllib/plugins

Files:

• CONTENTdmPlugin.pm (modified) (1 diff)
• ConvertBinaryFile.pm (modified) (2 diffs)
• ConvertToRogPlugin.pm (modified) (1 diff)
• TextPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm

@@ -489 +489 @@
     $tailname =~ s/\.+//g;
     $tailname =~ s/\-+//g;
+
+    $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
     $suffix = lc($suffix);
     my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");

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;} 

gsdl/trunk/perllib/plugins/ConvertToRogPlugin.pm

@@ -104 +104 @@
     # Remove any white space from filename -- no risk of name collision, and
     # makes later conversion by utils simpler. Leave spaces in path...
-    $tailname =~ s/\s+//g; 
+    $tailname =~ s/\s+//g;
+    $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
 
     my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");

gsdl/trunk/perllib/plugins/TextPlugin.pm

@@ -170 +170 @@
     # convert to utf-8 otherwise we have problems with the doc.xml file
     # later on
-    &unicode::ensure_utf8(\$tailname); # TODO: does this change the filename or not?
-             # need to test this out on a windows computer using a Greek filename
+    $tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
+
     $suffix = lc($suffix);
     my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");