Changeset 16382

Timestamp:

2008-07-14T14:38:47+12:00 (15 years ago)

Author:

kjdon

Message:

filename_no_path arg to generate_images must now be in utf8, and then the filename metadata is added using set_utf8_metadata instead of set_metadata

File:

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

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -29 +29 @@
 
 use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
+
 use gsprintf 'gsprintf';
 
@@ -142 +144 @@
     &gsprintf($outhandle, "ImageConverter: {ImageConverter.noconversionavailable} ({ImageConverter.".$self->{'no_image_conversion_reason'}."})\n");
     }
+       
 }
     
@@ -149 +152 @@
 # generate screenview if required
 # discover image metadata
+# filename_no_path must be in utf8
 sub generate_images {
     my $self = shift(@_);
@@ -191 +195 @@
 
     # add Image metadata 
-    $doc_obj->add_metadata($section, "Image", $filename_no_path);
-
-    # Source and SourceUTF8 - should this be converted filename or original?
-    # here we overwrite the originals with converted ones
-    $self->set_Source_metadata($doc_obj, $filename_no_path);
+    $doc_obj->add_utf8_metadata($section, "Image", $filename_no_path);
+
+    # here we overwrite the original with the potentially converted one
+    $doc_obj->set_utf8_metadata_element($section, "Source", $filename_no_path);
 
     # use identify to get info about the (possibly converted) image
@@ -245 +248 @@
                  "image/$thumbnailtype",$section);
     $doc_obj->add_metadata ($section, "ThumbType", $thumbnailtype);
-    $doc_obj->add_metadata ($section, "Thumb", $filehead."_thumb.$thumbnailtype");
+    $doc_obj->add_utf8_metadata ($section, "Thumb", $filehead."_thumb.$thumbnailtype");
     
     $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
@@ -282 +285 @@
     $doc_obj->associate_file("$screenviewfilename", $filehead."_screen.$screenviewtype", "image/$screenviewtype",$section);
     $doc_obj->add_metadata ($section, "ScreenType", $screenviewtype);
-    $doc_obj->add_metadata ($section, "Screen", $filehead."_screen.$screenviewtype");
+    $doc_obj->add_utf8_metadata ($section, "Screen", $filehead."_screen.$screenviewtype");
     
     $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");