Changeset 23335 for main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

Timestamp:

2010-11-19T13:29:29+13:00 (13 years ago)

Author:

davidb

Message:

Work done on improving handing of filenames when the actualy filename encoding used is not necesarrily known. Tested for Linux. Work currently includes some debug statements that will be removed once testing for Windows and Mac is done.

File:

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

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

@@ -110 +110 @@
     my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
-
     my $outhandle = $self->{'outhandle'};
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
@@ -116 +115 @@
     if ($self->{'image_conversion_available'} == 1)
     {
-    my $utf8_filename_no_path = $self->filepath_to_utf8($filename_no_path);
-    my $url_encoded_filename = &util::rename_file($utf8_filename_no_path, $self->{'file_rename_method'});
-    $self->generate_images($filename_full_path, $url_encoded_filename, $doc_obj, $doc_obj->get_top_section()); # should we check the return value?
+    my $filename_encoding = $self->deduce_filename_encoding($file,$metadata);
+
+#   my $utf8_filename_no_path = $self->filepath_to_utf8($filename_no_path);
+#   my $url_encoded_filename = &util::rename_file($utf8_filename_no_path, $self->{'file_rename_method'});
+
+#   $self->generate_images($filename_full_path, $url_encoded_filename, 
+#                  $doc_obj, $doc_obj->get_top_section()); # should we check the return value?
+
+    $filename_no_path = &unicode::raw_filename_to_url_encoded($filename_no_path);
+
+    # should we check the return value?
+    $self->generate_images($filename_full_path, $filename_no_path, 
+                   $doc_obj, $doc_obj->get_top_section(),$filename_encoding); 
+
     }
     else