Changeset 16923

Timestamp:

2008-08-20T17:48:10+12:00 (16 years ago)

Author:

ak19

Message:

1. Sets both the Source and new SourceFile metadata; 2. Calls unicode::filename_to_url() to work out the url to files

File:

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

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -189 +189 @@
     # Encode those percent signs themselves so that urls to the imgs refer to them correctly 
     my $url_to_filehead = $filehead;
-    $url_to_filehead =~ s/%/%25/g if($url_to_filehead !~ m/%25/);
+    $url_to_filehead = &unicode::filename_to_url();
     my $url_to_filename_no_path = $filename_no_path;
-    $url_to_filename_no_path =~ s/%/%25/g if($url_to_filename_no_path !~ m/%25/);
+    $url_to_filename_no_path = &unicode::filename_to_url();
     
     # Convert the image to a new type (if required).
@@ -212 +212 @@
 
     # here we overwrite the original with the potentially converted one
-    $doc_obj->set_utf8_metadata_element($section, "Source", $filename_no_path); # name 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", $filename_no_path); # displayname of generated image
 
     # use identify to get info about the (possibly converted) image