Changeset 31926

Timestamp:

2017-09-01T12:27:21+12:00 (6 years ago)

Author:

kjdon

Message:

added a new option 'store_original_image'. If this is set, and the original image was converted to a new type, then we will also store the original. This was added for pei jones. Have tif images, want png source, thumb and screen images, but also want the tif files for doc editing purposes. have done no work on this if there are funny characters in the filename or different encodings

File:

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

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

@@ -96 +96 @@
     'range' => "1,",
     'reqd' => "no" },
-
+    { 'name' => "store_original_image",
+      'desc' => "{ImageConverter.store_original_image}",
+      'type' => "flag",
+      'reqd' => "no"},
       { 'name' => "apply_aspectpad",
     'desc' => "{ImageConverter.apply_aspectpad}",
@@ -212 +215 @@
     # 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; 
-
+    my $filename_no_path = $filename_encoded_no_path;
+    my $original_filename_full_path = $filename_full_path;
+    my $original_filename_no_path = $filename_no_path;
+    my $original_file_was_converted = 0;
+    
     # check image magick status
     return 0 if $self->{'image_conversion_available'} == 0;
@@ -258 +264 @@
     if ($converttotype ne "" && $filename_full_path !~ m/$converttotype$/) {
 #   #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
-
     my ($result, $converted_filename_full_path)
         = $self->convert($filename_full_path, $converttotype, "", "CONVERTTYPE");
@@ -269 +274 @@
         $self->{'orig_file'} = $converted_filename_full_path;
     }
+    $original_file_was_converted = 1;
     }
 
@@ -292 +298 @@
         $self->{'orig_file'} = $aspectpad_filename_full_path;
     }
-    }
-    
-
-
+    $original_file_was_converted = 1;
+
+    }
+    
     # add Image metadata 
     $doc_obj->add_utf8_metadata($section, "Image", $url_to_filename_no_path); # url to generated image
@@ -345 +351 @@
     $doc_obj->associate_file($filename_full_path, $filename_no_path, "image/$type", $section);
 
+    if ($self->{'store_original_image'} && $original_file_was_converted) {
+    # hack to guess the filetype
+    my ($orig_type) = ($original_filename_full_path =~ m/\.(.*?)$/);
+    # add the original image as an associated file
+    $doc_obj->associate_file($original_filename_full_path, $original_filename_no_path, "image/$orig_type", $section);
+    }
     if ($self->{'create_thumbnail'} eq "true") {
     $self->create_thumbnail($filename_full_path, $filehead, $doc_obj, $section, $assocfilemeta, $url_to_filehead);