Changeset 16771 for gsdl/trunk/perllib/plugins/ImageConverter.pm

Timestamp:

2008-08-13T20:35:13+12:00 (16 years ago)

Author:

ak19

Message:

Changes to make it compatible with multilingual filenames. Uses URL encoding for this.

File:

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

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -181 +181 @@
     }
 
+    # Images that will get generated may contain percent signs in their src filenames
+    # 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; 
+    my $url_to_filename_no_path = $filename_no_path;
+    $url_to_filename_no_path =~ s/%/%25/g; 
+
     # Convert the image to a new type (if required).
     my $converttotype = $self->{'converttotype'};
@@ -186 +193 @@
 
     if ($converttotype ne "" && $filename_full_path !~ m/$converttotype$/) {
-    
+    #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
+
     my $result = $self->convert($filename_full_path, $converttotype, "", "");
     ($filename_full_path) = ($result =~ /=>(.*\.$converttotype)/);
@@ -192 +200 @@
     $type = $converttotype;
     $filename_no_path = "$filehead.$type";
+    $url_to_filename_no_path = "$url_to_filehead.$type";
     }
 
     # add Image metadata 
-    $doc_obj->add_utf8_metadata($section, "Image", $filename_no_path);
+    $doc_obj->add_utf8_metadata($section, "Image", $url_to_filename_no_path); # url to generated image
 
     # here we overwrite the original with the potentially converted one
-    $doc_obj->set_utf8_metadata_element($section, "Source", $filename_no_path);
+    $doc_obj->set_utf8_metadata_element($section, "Source", $filename_no_path); # name of generated image
 
     # use identify to get info about the (possibly converted) image
@@ -225 +234 @@
 
     if ($self->{'create_thumbnail'} eq "true") {
-    $self->create_thumbnail($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta);
+    $self->create_thumbnail($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead);
     }
     if ($self->{'create_screenview'} eq "true") {
-    $self->create_screenview($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta);
+    $self->create_screenview($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead);
     }
 }
@@ -234 +243 @@
 sub create_thumbnail {
     my $self = shift(@_);
-    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta) = @_;
+    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead) = @_;
+    $url_to_filehead = $filehead unless defined $url_to_filehead; 
 
     my $thumbnailsize = $self->{'thumbnailsize'};
@@ -246 +256 @@
     if (-e "$thumbnailfile") { 
     $doc_obj->associate_file("$thumbnailfile", $filehead."_thumb.$thumbnailtype", 
-                 "image/$thumbnailtype",$section);
+                 "image/$thumbnailtype",$section); # name of generated image
     $doc_obj->add_metadata ($section, "ThumbType", $thumbnailtype);
-    $doc_obj->add_utf8_metadata ($section, "Thumb", $filehead."_thumb.$thumbnailtype");
+    $doc_obj->add_utf8_metadata ($section, "Thumb", $url_to_filehead."_thumb.$thumbnailtype"); # url to generated image
     
     $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
@@ -268 +278 @@
     
     my $self = shift(@_);
-    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta) = @_;
+    my ($original_file, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead) = @_;
+    $url_to_filehead = $filehead unless defined $url_to_filehead; 
 
     # To do: if the actual image smaller than the screenview size,
@@ -283 +294 @@
     #add the screenview as an associated file ...
     if (-e "$screenviewfilename") { 
-    $doc_obj->associate_file("$screenviewfilename", $filehead."_screen.$screenviewtype", "image/$screenviewtype",$section);
+    $doc_obj->associate_file("$screenviewfilename", $filehead."_screen.$screenviewtype", "image/$screenviewtype",$section); # name of generated image
     $doc_obj->add_metadata ($section, "ScreenType", $screenviewtype);
-    $doc_obj->add_utf8_metadata ($section, "Screen", $filehead."_screen.$screenviewtype");
+    $doc_obj->add_utf8_metadata ($section, "Screen", $url_to_filehead."_screen.$screenviewtype"); # url to generated image
     
     $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");