Changeset 23352 for main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

Timestamp:

2010-11-28T23:24:22+13:00 (13 years ago)

Author:

davidb

Message:

Modifications to code to support filename encoding issues when tested under Windows

File:

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

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

@@ -152 +152 @@
 sub generate_images {
     my $self = shift(@_);
-    my ($filename_full_path, $filename_no_path, $doc_obj, $section, $filename_encoding) = @_;
+    my ($filename_full_path, $filename_encoded_full_path, $doc_obj, $section, $filename_encoding) = @_;
+
+    my ($unused_fefp,$filename_encoded_no_path)
+    = util::get_full_filenames("",$filename_encoded_full_path);
+
+    # The following is potentially very muddled thinking (but currently seems to work)
+    # generate_images currently called from ImagePlugin and PagedImagePlugin
+    my $filename_no_path = $filename_encoded_no_path; 
 
     # check image magick status
@@ -219 +226 @@
 #    $self->set_Source_metadata($doc_obj,$url_to_filename_no_path,undef);
 
-    $self->set_Source_metadata($doc_obj,&unicode::url_decode($filename_no_path),
-                               $filename_encoding);
+    my $raw_filename_full_path = &unicode::url_decode($filename_encoded_full_path);
+    $self->set_Source_metadata($doc_obj,$raw_filename_full_path,
+                   $filename_encoding);