Changeset 23335 for main/trunk/greenstone2/perllib/plugins/ImageConverter.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/ImageConverter.pm (modified) (3 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) = @_;
+    my ($filename_full_path, $filename_no_path, $doc_obj, $section, $filename_encoding) = @_;
 
     # check image magick status
@@ -196 +196 @@
 
     if ($converttotype ne "" && $filename_full_path !~ m/$converttotype$/) {
-    #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
+#   #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
 
     my ($result, $converted_filename_full_path)
@@ -214 +214 @@
 
     # here we overwrite the original with the potentially converted one
-    $doc_obj->set_utf8_metadata_element($section, "Source", &unicode::url_decode($filename_no_path)); # displayname of generated image
-    $doc_obj->set_utf8_metadata_element($section, "SourceFile", $url_to_filename_no_path); # displayname of generated image
+#    $doc_obj->set_utf8_metadata_element($section, "Source", &unicode::url_decode($filename_no_path)); # displayname of generated image
+#    $doc_obj->set_utf8_metadata_element($section, "SourceFile", $url_to_filename_no_path); # displayname of generated image
+
+#    $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);
+
 
     # use identify to get info about the (possibly converted) image